summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po724
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po717
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po716
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po725
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po724
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po716
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po723
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po725
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po723
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po830
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po723
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po736
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po721
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po723
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po723
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po724
-rw-r--r--locale/statusnet.pot683
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po734
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po719
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po722
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po717
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po711
39 files changed, 18842 insertions, 9332 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 948ac9bf8..5c4fdc370 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:46+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:03+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "Gesluit"
msgid "Save access settings"
msgstr "Stoor toegangsinstellings"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Stoor"
@@ -103,7 +108,7 @@ msgstr "Hierdie bladsy bestaan nie"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Onbekende gebruiker."
@@ -336,7 +341,7 @@ msgstr "Geen status met die ID gevind nie."
msgid "This status is already a favorite."
msgstr "Hierdie status is reeds 'n gunsteling."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
@@ -458,7 +463,7 @@ msgstr "Groep nie gevind nie!"
msgid "You are already a member of that group."
msgstr "U is reeds 'n lid van die groep."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -509,17 +514,17 @@ msgid "Invalid token."
msgstr "Ongeldige token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -550,12 +555,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Die vorm is onverwags ingestuur."
@@ -807,27 +815,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nee"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Moenie hierdie gebruiker blokkeer nie"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkeer hierdie gebruiker"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -840,8 +865,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Die groep bestaan nie."
@@ -900,16 +925,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Kon nie gebruiker opdateer nie."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -961,11 +994,13 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Moenie die applikasie verwyder nie"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Skrap hierdie applikasie"
@@ -998,11 +1033,13 @@ msgstr "Verwyder kennisgewing"
msgid "Are you sure you want to delete this notice?"
msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Moenie hierdie kennisgewing verwyder nie"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Verwyder hierdie kennisgewing"
@@ -1024,7 +1061,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Verwyder die gebruiker"
@@ -1135,15 +1173,13 @@ msgid "Reset back to default"
msgstr "Stel terug na standaard"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Stoor"
@@ -1269,178 +1305,238 @@ msgstr "Dit was nie moontlik om die aliasse te skep nie."
msgid "Options saved."
msgstr "Opsies is gestoor."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-posvoorkeure"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-posadres"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Huidige bevestigde e-posadres."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Verwyder"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Kanselleer"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-posadres"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-posadres, soos \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Voeg by"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkomende e-pos"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nuut"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Voorkeure"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Voorkeure is gestoor."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Geen e-posadres."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Dit is al reeds u e-posadres."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Dit is die verkeerde IM-adres."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Bevestiging gekanselleer."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Dit is nie u e-posadres nie."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Die adres is verwyder."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Geen inkomende e-posadres."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kon nie gebruikersdata opdateer nie."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkomende e-posadres is verwyder."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1623,15 +1719,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Blok hierdie gebruiker van hierdie groep"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1799,90 +1897,149 @@ msgstr ""
msgid "Error removing the block."
msgstr ""
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-instellings"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM is nie beskikbaar nie."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IP-adres"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IP-adres"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Voorkeure"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Voorkeure is gestoor."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Geen Jabber-ID nie."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Nie 'n geldige Jabber-ID nie"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Dit is al reeds u Jabber-ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Dit is die verkeerde IM-adres."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bevestiging gekanselleer."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Dit is nie u Jabber-ID nie."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Die adres is verwyder."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1923,7 +2080,9 @@ msgstr "Nooi nuwe gebruikers"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2016,7 +2175,9 @@ msgstr "U moet aanteken alvorens u by groep kan aansluit."
msgid "No nickname or ID."
msgstr "Geen gebruikersnaam of ID nie."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s het by groep %2$s aangesluit"
@@ -2025,11 +2186,13 @@ msgstr "%1$s het by groep %2$s aangesluit"
msgid "You must be logged in to leave a group."
msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "U is nie 'n lid van daardie groep nie."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s het die groep %2$s verlaat"
@@ -2135,12 +2298,12 @@ msgstr ""
msgid "New message"
msgstr "Nuwe boodskap"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Geen inhoud nie!"
@@ -2148,7 +2311,7 @@ msgstr "Geen inhoud nie!"
msgid "No recipient specified."
msgstr "Geen ontvanger gespesifiseer nie."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2396,7 +2559,7 @@ msgid "6 or more characters"
msgstr "6 of meer karakters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Bevestig"
@@ -3691,95 +3854,156 @@ msgstr ""
msgid "Save site notice"
msgstr ""
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS-instellings"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr ""
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IP-adres"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS-nommer"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Voorkeure"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Voorkeure is gestoor."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Geen telefoonnommer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bevestiging gekanselleer."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-nommer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -4920,10 +5144,8 @@ msgstr "Lees-skryf"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Kanselleer"
@@ -4999,34 +5221,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr ""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5034,195 +5262,201 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "Kon nie die groep skep nie."
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Volle naam: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Ligging: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Tuisblad: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Oor: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr ""
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U volg hierdie gebruiker:"
msgstr[1] "U volg hierdie gebruikers:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Hierdie gebruiker volg u:"
msgstr[1] "Hierdie gebruikers volg u:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "U is nie 'n lid van enige groep nie."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U is 'n lid van hierdie groep:"
msgstr[1] "U is 'n lid van hierdie groepe:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6044,6 +6278,10 @@ msgid "Repeat this notice?"
msgstr ""
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr ""
@@ -6229,47 +6467,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c23a8cb06..a300979b8 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:50+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:06+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "مُغلق"
msgid "Save access settings"
msgstr "حفظ إعدادت الوصول"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "احفظ"
@@ -105,7 +110,7 @@ msgstr "لا صفحة كهذه"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -334,7 +339,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "هذه الحالة مفضلة بالفعل."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "تعذّر إنشاء مفضلة."
@@ -451,7 +456,7 @@ msgstr "لم توجد المجموعة!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -503,17 +508,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -546,12 +551,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -803,27 +811,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "لا"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -836,8 +861,8 @@ msgstr "فشل حفظ معلومات المنع."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "لا مجموعة كهذه."
@@ -896,16 +921,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "تعذّر تحديث المستخدم."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
@@ -957,11 +990,13 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "لا تحذف هذا التطبيق"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "احذف هذا التطبيق"
@@ -994,11 +1029,13 @@ msgstr "احذف الإشعار"
msgid "Are you sure you want to delete this notice?"
msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1020,7 +1057,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "احذف هذا المستخدم"
@@ -1131,15 +1169,13 @@ msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
@@ -1265,178 +1301,238 @@ msgstr "تعذّر إنشاء الكنى."
msgid "Options saved."
msgstr "حُفظت الخيارات."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "إعدادات البريد الإلكتروني"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "العنوان"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "عنوان البريد الإلكتروني"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "أزل"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "ألغِ"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "عنوان البريد الإلكتروني"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "أضف"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "البريد الإلكتروني الوارد"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "التفضيلات"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "حُفِظت التفضيلات."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "حُفظت تفضيلات التصميم."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "لا عنوان بريد إلكتروني."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "هذا عنوان محادثة فورية خاطئ."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "أُلغي التأكيد."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "هذا ليس عنوان بريدك الإلكتروني."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "أزيل هذا العنوان."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "لا عنوان بريد إلكتروني وارد."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "تعذّر تحديث سجل المستخدم."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1622,15 +1718,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة."
@@ -1804,90 +1902,148 @@ msgstr "المستخدم ليس ممنوعًا من المجموعة."
msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "إعدادات المراسلة الفورية"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "المراسلة الفورية غير متوفرة."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "عنوان المراسلة الفورية"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "عنوان المراسلة الفورية"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "التفضيلات"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "لا هوية جابر."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr ""
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "ليست هوية جابر صالحة"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr ""
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "هذا عنوان محادثة فورية خاطئ."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "أُلغي التأكيد."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "هذه ليست هويتك في جابر."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "أزيل هذا العنوان."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1928,7 +2084,9 @@ msgstr "دعوة مستخدمين جدد"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2022,7 +2180,9 @@ msgstr "يجب أن تلج لتنضم إلى مجموعة."
msgid "No nickname or ID."
msgstr "لا اسم مستعار."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s انضم للمجموعة %2$s"
@@ -2031,11 +2191,13 @@ msgstr "%1$s انضم للمجموعة %2$s"
msgid "You must be logged in to leave a group."
msgstr "يجب أن تلج لتغادر مجموعة."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "لست عضوا في تلك المجموعة."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
@@ -2142,12 +2304,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة.
msgid "New message"
msgstr "رسالة جديدة"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "لا محتوى!"
@@ -2155,7 +2317,7 @@ msgstr "لا محتوى!"
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2405,7 +2567,7 @@ msgid "6 or more characters"
msgstr "6 أحرف أو أكثر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "أكّد"
@@ -3734,95 +3896,156 @@ msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسم
msgid "Save site notice"
msgstr "احفظ إشعار الموقع"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "لا يمكنك استلام رسائل قصيرة عبر البريد الإلكرتوني من %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "الرسائل القصيرة غير متوفرة."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "عنوان المراسلة الفورية"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "رمز التأكيد"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "أكّد"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "رقم هاتف SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "التفضيلات"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "لا رقم هاتف."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "إن رقم التأكيد هذا خاطئ."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "أُلغي التأكيد."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "هذا ليس رقم هاتفك."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "رقم هاتف SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "لم تدخل رمزًا"
@@ -4978,10 +5201,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "ألغِ"
@@ -5055,34 +5276,40 @@ msgstr "فشل الأمر"
msgid "Notice with that id does not exist"
msgstr "الملاحظة بهذا الرقم غير موجودة"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "ليس للمستخدم إشعار أخير"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "التنبيه تم إرساله إلى %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5093,169 +5320,173 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "أنت بالفعل عضو في هذه المجموعة"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s انضم إلى مجموعة %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ترك المجموعة %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "الصفحة الرئيسية: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "عن: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "رسالة مباشرة إلى %s تم إرسالها"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "كرر بالفعل هذا الإشعار"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "الإشعار من %s مكرر"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "خطأ تكرار الإشعار."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "رُد على رسالة %s"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "خطأ أثناء حفظ الإشعار."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "الأمر لم يُجهزّ بعد."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "الإشعار مُطفأ."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "تعذّر إطفاء الإشعارات."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "الإشعار يعمل."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "تعذّر تشغيل الإشعار."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "ألغِ الاشتراك"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -5265,11 +5496,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -5279,11 +5510,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -5293,7 +5524,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6175,6 +6406,10 @@ msgid "Repeat this notice?"
msgstr "أأكرّر هذا الإشعار؟ّ"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "نعم"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "كرّر هذا الإشعار"
@@ -6361,47 +6596,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "مراقب"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 878efe2c6..765a3a6db 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:53+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:09+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "مُغلق"
msgid "Save access settings"
msgstr "اذف إعدادت الموقع"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -111,7 +116,7 @@ msgstr "لا صفحه كهذه"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -340,7 +345,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "الحاله دى موجوده فعلا فى التفضيلات."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "تعذّر إنشاء مفضله."
@@ -457,7 +462,7 @@ msgstr "لم توجد المجموعة!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -509,17 +514,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -552,12 +557,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -810,27 +818,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "لا"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -843,8 +868,8 @@ msgstr "فشل حفظ معلومات المنع."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "لا مجموعه كهذه."
@@ -903,16 +928,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "تعذّر تحديث المستخدم."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
@@ -967,12 +1000,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "احذف هذا الإشعار"
@@ -1006,11 +1041,13 @@ msgstr "احذف الإشعار"
msgid "Are you sure you want to delete this notice?"
msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1032,7 +1069,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "احذف هذا المستخدم"
@@ -1143,15 +1181,13 @@ msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
@@ -1278,178 +1314,238 @@ msgstr "تعذّر إنشاء الكنى."
msgid "Options saved."
msgstr "حُفظت الخيارات."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "تظبيطات الايميل"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "العنوان"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "عنوان الايميل"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "أزل"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "ألغِ"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "عنوان الايميل"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "أضف"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "البريد الإلكترونى الوارد"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "التفضيلات"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "حُفِظت التفضيلات."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "لا عنوان بريد إلكترونى."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "هذا عنوان محادثه فوريه خاطئ."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "أُلغى التأكيد."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "هذا ليس عنوان بريدك الإلكترونى."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "أزيل هذا العنوان."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1635,15 +1731,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
@@ -1811,90 +1909,148 @@ msgstr "المستخدم ليس ممنوعًا من المجموعه."
msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "تظبيطات بعت الرسايل الفوريه"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "المراسله الفوريه غير متوفره."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "عنوان الرساله الفوريه"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "عنوان الرساله الفوريه"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "التفضيلات"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "لا هويه جابر."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr ""
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "ليست هويه جابر صالحة"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr ""
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "هذا عنوان محادثه فوريه خاطئ."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "أُلغى التأكيد."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "هذه ليست هويتك فى جابر."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "أزيل هذا العنوان."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1935,7 +2091,9 @@ msgstr "دعوه مستخدمين جدد"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2030,7 +2188,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "لا اسم مستعار."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s دخل جروپ %2$s"
@@ -2039,11 +2199,13 @@ msgstr "%1$s دخل جروپ %2$s"
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "لست عضوا فى تلك المجموعه."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
@@ -2150,12 +2312,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده.
msgid "New message"
msgstr "رساله جديدة"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "لا محتوى!"
@@ -2163,7 +2325,7 @@ msgstr "لا محتوى!"
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2411,7 +2573,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "أكّد"
@@ -3728,95 +3890,156 @@ msgstr ""
msgid "Save site notice"
msgstr "إشعار الموقع"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "تظبيطات الـSMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "الرسائل القصيره غير متوفره."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "عنوان الرساله الفوريه"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "رمز التأكيد"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "أكّد"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "نمرة تليفون الـSMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "التفضيلات"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "لا رقم هاتف."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "أُلغى التأكيد."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "هذا ليس رقم هاتفك."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "نمرة تليفون الـSMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -4995,10 +5218,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "ألغِ"
@@ -5072,34 +5293,40 @@ msgstr "فشل الأمر"
msgid "Notice with that id does not exist"
msgstr "الملاحظه بالـID ده مالهاش وجود"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "ليس للمستخدم إشعار أخير"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "ما نفعش يلاقى يوزر بإسم %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "ما نفعش يلاقى يوزر بإسم %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Nudge اتبعتت لـ %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5110,169 +5337,173 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "انت اصلا عضو فى الجروپ ده"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ما نفعش يدخل اليوزر %s لجروپ %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s انضم إلى مجموعه %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ما نفعش يضم %1$s للجروپ %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "ما نفعش يشيل اليوزر %s لجروپ %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ساب الجروپ %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "الصفحه الرئيسية: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "عن: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "رساله مباشره اتبعتت لـ %s"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "الملاحظه بتاعتك مش نافعه تتكرر"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "كرر بالفعل هذا الإشعار"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "الإشعار من %s مكرر"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "خطأ تكرار الإشعار."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "رُد على رساله %s"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "خطأ أثناء حفظ الإشعار."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "ألغِ الاشتراك"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأى أحد."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -5282,11 +5513,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -5296,11 +5527,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "لست عضوًا فى أى مجموعه."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -5310,7 +5541,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6133,6 +6364,10 @@ msgid "Repeat this notice?"
msgstr "كرر هذا الإشعار؟"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "نعم"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "كرر هذا الإشعار"
@@ -6320,47 +6555,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index c2c8b92df..a23a8a62a 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:56+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:12+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "Затворен"
msgid "Save access settings"
msgstr "Запазване настройките за достъп"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Запазване"
@@ -105,7 +110,7 @@ msgstr "Няма такака страница."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Няма такъв потребител"
@@ -338,7 +343,7 @@ msgstr "Не е открита бележка с такъв идентифика
msgid "This status is already a favorite."
msgstr "Тази бележка вече е отбелязана като любима."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Грешка при отбелязване като любима."
@@ -458,7 +463,7 @@ msgstr "Групата не е открита."
msgid "You are already a member of that group."
msgstr "Вече членувате в тази група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -510,17 +515,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -553,12 +558,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Неочаквано изпращане на форма."
@@ -814,27 +822,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Не"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Да не се блокира този потребител"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
@@ -847,8 +872,8 @@ msgstr "Грешка при записване данните за блокир
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Няма такава група"
@@ -908,16 +933,24 @@ msgstr "Неразпознат вид адрес %s"
msgid "That address has already been confirmed."
msgstr "Този адрес е вече потвърден."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Грешка при обновяване на потребителя."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Грешка при изтриване потвърждението по е-поща."
@@ -973,12 +1006,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Да не се изтрива бележката"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Изтриване на бележката"
@@ -1012,11 +1047,13 @@ msgstr "Изтриване на бележката"
msgid "Are you sure you want to delete this notice?"
msgstr "Наистина ли искате да изтриете тази бележка?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Да не се изтрива бележката"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -1038,7 +1075,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Изтриване на този потребител"
@@ -1154,15 +1192,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Запазване"
@@ -1295,31 +1331,43 @@ msgstr "Грешка при отбелязване като любима."
msgid "Options saved."
msgstr "Настройките са запазени."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Настройки на е-поща"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Управление на пощата, идваща от %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Адрес"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Адрес на е-поща"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Текущ потвърден адрес на е-поща."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Премахване"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1327,107 +1375,142 @@ msgstr ""
"Очаква се потвърждение за този адрес. Проверете кутията си (или папката за "
"спам) за съобщение с указания."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Отказ"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Адрес на е-поща"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Адрес на е-поща, като \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Добавяне"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Входяща поща"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Изпратете писмо до този адрес за публикуване като бележка."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Ново"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Настройки"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Изпращане на уведомления за нови абонаменти по пощата."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Изпращане на писмо при ново лично съобщение."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Изпращане на писмо при ново лично съобщение."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Искам да изпращам бележки по пощата."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Публикуване на MicroID за адреса на е-пощата."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Настройките са запазени."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Не е въведена е-поща."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилен адрес на е-поща."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Това и сега е адресът на е-пощата ви."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Тази е-поща вече се използва от друг потребител."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не може да се вмъкне код за потвърждение."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1436,43 +1519,56 @@ msgstr ""
"Проверете кутията (или папката за спам) за кода и указанията за използването "
"му."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Няма потвърждения, очакващи да бъдат отказани."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Грешен IM адрес."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Потвърждаването е прекъснато."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Това не е вашият адрес на е-поща."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Адресът е премахнат."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Няма входящ адрес на е-поща."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Грешка при обновяване записа на потребител."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Входящият адрес на е-поща е премахнат."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Добавен е нов входящ адрес на е-поща."
@@ -1665,17 +1761,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Списък с потребителите в тази група."
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "Списък с потребителите в тази група."
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1852,12 +1950,16 @@ msgstr "Потребителят ви е блокирал."
msgid "Error removing the block."
msgstr "Грешка при запазване на потребител."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "IM настройки"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1866,16 +1968,26 @@ msgstr ""
"Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%"
"%). Въведете адреса си в настройките по-долу."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM адрес"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Текущ потвърден Jabber/GTalk адрес."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1884,12 +1996,9 @@ msgstr ""
"Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
"съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM адрес"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1898,43 +2007,65 @@ msgstr ""
"Jabber или GTalk адрес, като \"UserName@example.org\". Първо се уверете, че "
"сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Настройки"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Изпращане на бележките по Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Настройките са запазени."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Няма Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Грешка при нормализация на този Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Неправилен Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Това вече е вашият Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Този Jabber ID принадлежи на друг потребител."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1943,10 +2074,35 @@ msgstr ""
"На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
"от %s, трябва да го одобрите."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Грешен IM адрес."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Грешка при изтриване потвърждението по е-поща."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Потвърждаването е прекъснато."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Това не е вашият Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Адресът е премахнат."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1987,7 +2143,9 @@ msgstr "Покани за нови потребители"
msgid "You are already subscribed to these users:"
msgstr "Вече сте абонирани за следните потребители:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2112,7 +2270,9 @@ msgstr "За да се присъедините към група, трябва
msgid "No nickname or ID."
msgstr "Няма псевдоним."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s се присъедини към групата %s"
@@ -2121,11 +2281,13 @@ msgstr "%s се присъедини към групата %s"
msgid "You must be logged in to leave a group."
msgstr "За напуснете група, трябва да сте влезли."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Не членувате в тази група."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s напусна групата %2$s"
@@ -2239,12 +2401,12 @@ msgstr "Използвайте тази бланка за създаване н
msgid "New message"
msgstr "Ново съобщение"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Не може да изпращате съобщения до този потребител."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Няма съдържание!"
@@ -2252,7 +2414,7 @@ msgstr "Няма съдържание!"
msgid "No recipient specified."
msgstr "Не е указан получател."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2514,7 +2676,7 @@ msgid "6 or more characters"
msgstr "6 или повече знака"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Потвърждаване"
@@ -3860,45 +4022,75 @@ msgstr ""
msgid "Save site notice"
msgstr "Нова бележка"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Настройки за SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM адрес"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Текущ потвърден телефонен номер за SMS-и."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Очаква се потвърждение за този телефонен номер."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Код за потвърждение"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Въведете кода, който получихте по телефона."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Потвърждаване"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Телефонен номер за SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Телефонен номер — с код, без пунктоация и без интервали."
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Настройки"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3906,23 +4098,34 @@ msgstr ""
"Получаване на бележки в SMS. Имайте предвид, че може да има допълнителни "
"такси от оператора."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Настройките са запазени."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Не е въведен телефонен номер."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Не е избран оператор."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Това и сега е номерът на телефона ви."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Този телефонен номер вече се използва от друг потребител."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3932,23 +4135,42 @@ msgstr ""
"Проверете съобщенията (или папката за спам) за кода и указанията за "
"използването му."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Този код за потвърждение е грешен."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Потвърждаването е прекъснато."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Това не е вашият телефонен номер."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Телефонен номер за SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Мобилен оператор"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Изберете оператор"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3957,7 +4179,8 @@ msgstr ""
"Мобилен оператор за SMS. Ако знаете оператор, поддържащ SMS от е-поща, който "
"не фигурира тук, пишете ни на адрес %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Не е въведен код."
@@ -5174,10 +5397,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Отказ"
@@ -5254,34 +5475,40 @@ msgstr "Грешка при изпълнение на командата"
msgid "Notice with that id does not exist"
msgstr "Не е открита бележка с такъв идентификатор."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Потребителят няма последна бележка"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Грешка при обновяване на потребител с потвърден email адрес."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Грешка при обновяване на потребител с потвърден email адрес."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "За съжаление тази команда все още не се поддържа."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Изпратено е побутване на %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5292,198 +5519,203 @@ msgstr ""
"Абонати: %2$s\n"
"Бележки: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Бележката е отбелязана като любима."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Вече членувате в тази група."
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Грешка при проследяване — потребителят не е намерен."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s се присъедини към групата %s"
-
-#: lib/command.php:373
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "Грешка при проследяване — потребителят не е намерен."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s напусна групата %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Пълно име: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Местоположение: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Относно: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
+"$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Прякото съобщение до %s е изпратено."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Грешка при изпращане на прякото съобщение"
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Не можете да повтаряте собствена бележка"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Вече сте повторили тази бележка."
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Бележката от %s е повторена"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Грешка при повтаряне на бележката."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Отговорът до %s е изпратен"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Грешка при записване на бележката."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Уточнете името на потребителя, за когото се абонирате."
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Не сте абонирани за този профил"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Абонирани сте за %s."
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Уточнете името на потребителя, от когото се отписвате."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписани сте от %s."
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Командата все още не се поддържа."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Уведомлението е изключено."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Грешка при изключване на уведомлението."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Уведомлението е включено."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Отписани сте от %s."
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за никого."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече сте абонирани за следните потребители:"
msgstr[1] "Вече сте абонирани за следните потребители:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Никой не е абониран за вас."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
msgstr[1] "Не членувате в тази група."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6330,6 +6562,10 @@ msgid "Repeat this notice?"
msgstr "Повтаряне на тази бележка"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Да"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Повтаряне на тази бележка"
@@ -6521,47 +6757,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 68e61dbab..d9fb1d082 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:59+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:15+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Serr"
msgid "Save access settings"
msgstr "Enrollañ an arventennoù moned"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Enrollañ"
@@ -103,7 +108,7 @@ msgstr "N'eus ket eus ar bajenn-se."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "N'eus ket eus an implijer-se."
@@ -334,7 +339,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
msgid "This status is already a favorite."
msgstr "Ur pennroll eo dija an ali-mañ."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Diposupl eo krouiñ ar pennroll-mañ."
@@ -451,7 +456,7 @@ msgstr "N'eo ket bet kavet ar strollad."
msgid "You are already a member of that group."
msgstr "Un ezel eus ar strollad-mañ eo dija."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
@@ -502,17 +507,17 @@ msgid "Invalid token."
msgstr "Fichenn direizh."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -543,12 +548,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Kinnig ar furmskrid dic'hortoz."
@@ -800,27 +808,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Ket"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Arabat stankañ an implijer-mañ"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ya"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Diposubl eo enrollañ an titouroù stankañ."
@@ -833,8 +858,8 @@ msgstr "Diposubl eo enrollañ an titouroù stankañ."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "N'eus ket eus ar strollad-se."
@@ -894,16 +919,24 @@ msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
msgid "That address has already been confirmed."
msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Diposubl eo hizivaat an implijer."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Diposubl eo dilemel ar postel kadarnadur."
@@ -955,11 +988,13 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Arabat eo dilemel ar poellad-mañ"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Dilemel ar poelad-se"
@@ -992,11 +1027,13 @@ msgstr "Dilemel un ali"
msgid "Are you sure you want to delete this notice?"
msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Arabat dilemel an ali-mañ"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Dilemel an ali-mañ"
@@ -1018,7 +1055,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Diverkañ an implijer-mañ"
@@ -1129,15 +1167,13 @@ msgid "Reset back to default"
msgstr "Adlakaat an arventennoù dre ziouer"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Enrollañ"
@@ -1263,178 +1299,238 @@ msgstr "Diposubl eo krouiñ an aliasoù."
msgid "Options saved."
msgstr "Enrollet eo bet ho dibarzhioù."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Arventennoù ar postel"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Merañ ar posteloù a fell deoc'h resevout a-berzh %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Chomlec'h"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Chomlec'h postel"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Dilemel"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Nullañ"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Chomlec'h postel"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Ouzhpennañ"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Postel o tont"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nevez"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Penndibaboù"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "C'hoant am eus kas va alioù dre bostel."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Embann ur MicroID evit ma chomlec'h postel."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Penndibaboù enrollet"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Enrollet eo bet an arventennoù design."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Chomlec'h postel ebet."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Ho postel eo dija."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Nullet eo bet ar gadarnadenn."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "N'eo ket ho postel."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Dilamet eo bet ar chomlec'h."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Chomlec'h postel ebet o tont."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1617,15 +1713,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Arabat stankañ an implijer-mañ eus ar strollad."
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1795,90 +1893,148 @@ msgstr "N'eo ket stanket an implijer-mañ eus ar strollad."
msgid "Error removing the block."
msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Arventennoù ar bostelerezh prim"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Dizimplijadus eo ar bostelerezh prim"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Chomlec'h postelerezh prim"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Chomlec'h postelerezh prim"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Penndibaboù"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Kas din an alioù dre Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Penndibaboù enrollet"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "ID Jabber ebet."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Diposubl eo implijout an ID Jabber-mañ"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "N'eo ket un ID Jabber reizh."
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Ho ID Jabber eo dija"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Implijet eo an Jabber ID-mañ gant un implijer all."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Diposubl eo dilemel ar postel kadarnadur."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Nullet eo bet ar gadarnadenn."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "N'eo ket ho ID Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Dilamet eo bet ar chomlec'h."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1919,7 +2075,9 @@ msgstr "Pediñ implijerien nevez"
msgid "You are already subscribed to these users:"
msgstr "Koumanantet oc'h dija d'an implijerien-mañ :"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2014,7 +2172,9 @@ msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
msgid "No nickname or ID."
msgstr "Lesanv pe ID ebet."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s a zo bet er strollad %2$s"
@@ -2023,11 +2183,13 @@ msgstr "%1$s a zo bet er strollad %2$s"
msgid "You must be logged in to leave a group."
msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
@@ -2140,12 +2302,12 @@ msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez."
msgid "New message"
msgstr "Kemennadenn nevez"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Goullo eo !"
@@ -2153,7 +2315,7 @@ msgstr "Goullo eo !"
msgid "No recipient specified."
msgstr "N'o peus ket lakaet a resever."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2402,7 +2564,7 @@ msgid "6 or more characters"
msgstr "6 arouezenn pe muioc'h"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Kadarnaat"
@@ -3701,95 +3863,156 @@ msgstr ""
msgid "Save site notice"
msgstr "Enrollañ ali ul lec'hienn"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Arventennoù SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Dizimplijadus eo an SMS."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Chomlec'h postelerezh prim"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Kod kadarnaat"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Niverenn bellgomz evit an SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Penndibaboù"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Penndibaboù enrollet"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Niverenn bellgomz ebet."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Ho niverenn pellgomz eo dija."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "D'un implijer all eo an niverenn-mañ dija."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Nullet eo bet ar gadarnadenn."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "n'eo ket ho niverenn pellgomz."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Niverenn bellgomz evit an SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Dibab un douger"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "N'eo bet lakaet kod ebet"
@@ -4933,10 +5156,8 @@ msgstr "Lenn-skrivañ"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Nullañ"
@@ -5012,34 +5233,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr ""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Blinkadenn kaset da %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5047,198 +5274,204 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Dibosupl eo enskrivañ an implijer %s d'ar strollad %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "emezelet eo %s er strollad %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Anv klok : %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Lec'hiadur : %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Lec'hienn Web : %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Diwar-benn : %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn o peus lakaet."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Respont kaset da %s"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Digoumanantet eus %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:754
+#: lib/command.php:780
#, fuzzy
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are subscribed to this person:"
msgstr[1] "You are subscribed to these people:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:776
+#: lib/command.php:802
#, fuzzy
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "This person is subscribed to you:"
msgstr[1] "These people are subscribed to you:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:798
+#: lib/command.php:824
#, fuzzy
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are a member of this group:"
msgstr[1] "You are a member of these groups:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6060,6 +6293,10 @@ msgid "Repeat this notice?"
msgstr "Adkregiñ gant an ali-mañ ?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ya"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Adkregiñ gant an ali-mañ"
@@ -6246,47 +6483,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Habasker"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "miz zo well-wazh"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index df453314e..778a1ebce 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:05+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:17+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Tancat"
msgid "Save access settings"
msgstr "Desa els paràmetres del lloc"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Desa"
@@ -109,7 +114,7 @@ msgstr "No existeix la pàgina."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No existeix aquest usuari."
@@ -347,7 +352,7 @@ msgstr "No s'ha trobat cap estatus amb aquesta ID."
msgid "This status is already a favorite."
msgstr "Aquest estat ja és un preferit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "No es pot crear favorit."
@@ -467,7 +472,7 @@ msgstr "No s'ha trobat el grup."
msgid "You are already a member of that group."
msgstr "Ja sou membre del grup."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "L'administrador us ha blocat del grup."
@@ -519,17 +524,17 @@ msgid "Invalid token."
msgstr "Mida invàlida."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -562,12 +567,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Enviament de formulari inesperat."
@@ -823,27 +831,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquejar aquest usuari"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Error al guardar la informació del block."
@@ -856,8 +881,8 @@ msgstr "Error al guardar la informació del block."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "No s'ha trobat el grup."
@@ -917,16 +942,24 @@ msgstr "Tipus d'adreça desconeguda %s."
msgid "That address has already been confirmed."
msgstr "Aquesta adreça ja ha estat confirmada."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "No s'ha pogut actualitzar l'usuari."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
@@ -979,12 +1012,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "No es pot esborrar la notificació."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Elimina aquesta aplicació"
@@ -1019,11 +1054,13 @@ msgstr "Eliminar nota."
msgid "Are you sure you want to delete this notice?"
msgstr "N'estàs segur que vols eliminar aquesta notificació?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "No elimineu aquest avís"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -1045,7 +1082,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Suprimeix l'usuari"
@@ -1157,15 +1195,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Guardar"
@@ -1298,32 +1334,44 @@ msgstr "No s'han pogut crear els àlies."
msgid "Options saved."
msgstr "Configuració guardada."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Configuració del correu electrònic"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Gestionar com reps correus de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adreça"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adreça de correu electrònic"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Adreça electrònica confirmada actualment."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Suprimeix"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1331,111 +1379,146 @@ msgstr ""
"Esperant a confirmar aquesta direcció. Revisa la teva safata d'entrada (i la "
"carpeta de spam!) per al missatge amb les instruccions."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel·la"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adreça de correu electrònic"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Afegeix"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correu electrònic entrant"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Envia correu electrònic a aquesta adreça per publicar noves notificacions."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nou"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferències"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
"electrònic."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Vull publicar notificacions per correu electrònic."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publica una MicroID per al meu correu electrònic."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "S'han desat les preferències."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "S'han desat les preferències de disseny."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "No hi ha cap adreça electrònica."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Ja és la vostra adreça electrònica."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "L'adreça electrònica ja pertany a un altre usuari."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "No s'ha pogut inserir el codi de confirmació."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1444,43 +1527,56 @@ msgstr ""
"Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
"codi i les instruccions per utilitzar-lo."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Cap confirmació pendent per a cancel·lar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmació cancel·lada."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Aquest no és el teu correu electrònic"
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "L'adreça ha estat eliminada."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No hi ha cap direcció de correu electrònic entrant."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "No s'ha pogut actualitzar el registre de l'usuari."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Eliminat el correu electrònic entrant."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nou correu electrònic entrant afegit."
@@ -1670,15 +1766,17 @@ msgstr ""
"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del "
"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "No bloquis l'usuari del grup"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Bloca l'usuari del grup"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
@@ -1851,11 +1949,15 @@ msgstr "L'usuari no està blocat del grup."
msgid "Error removing the block."
msgstr "S'ha produït un error en suprimir el bloc."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Paràmetres de missatgeria instantània"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1864,15 +1966,24 @@ msgstr ""
"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
"GTalk. Configura la teva adreça i opcions a sota."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "La MI no és disponible."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adreça de missatgeria instantània"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Adreça actual Jabber/Gtalk confirmada."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1882,11 +1993,9 @@ msgstr ""
"Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
"llista d'amics?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adreça de missatgeria instantània"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1896,45 +2005,67 @@ msgstr ""
"assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
"missatgeria instantània o a GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferències"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Envia'm avisos per Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Envia'm un avís quan el meu estat Jabber/GTalk canvii."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Envia'm respostes a través de Jabber/GTalk de la gent a la que no estic "
"subscrita."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "S'han desat les preferències."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Cap Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Impossible normalitzar aquest Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Jabber ID no vàlid"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Aquest ja és el teu Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1943,10 +2074,35 @@ msgstr ""
"S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
"has afegit. Has d'acceptar que %s et pugui enviar missatges."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmació cancel·lada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Aquest no és el teu Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "L'adreça ha estat eliminada."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1991,7 +2147,9 @@ msgstr "Invitar nous usuaris"
msgid "You are already subscribed to these users:"
msgstr "Ja estàs subscrit a aquests usuaris:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2115,7 +2273,9 @@ msgstr "Has d'haver entrat per participar en un grup."
msgid "No nickname or ID."
msgstr "Cap sobrenom o ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s s'ha unit al grup %2$s"
@@ -2124,11 +2284,13 @@ msgstr "%1$s s'ha unit al grup %2$s"
msgid "You must be logged in to leave a group."
msgstr "Has d'haver entrat per a poder marxar d'un grup."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "No ets membre d'aquest grup."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s ha abandonat el grup %s"
@@ -2244,12 +2406,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup."
msgid "New message"
msgstr "Nou missatge"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "No podeu enviar un misssatge a aquest usuari."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Cap contingut!"
@@ -2257,7 +2419,7 @@ msgstr "Cap contingut!"
msgid "No recipient specified."
msgstr "No has especificat el destinatari."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
@@ -2518,7 +2680,7 @@ msgid "6 or more characters"
msgstr "6 o més caràcters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -3899,46 +4061,76 @@ msgstr ""
msgid "Save site notice"
msgstr "Avís del lloc"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Paràmetres de l'SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Pots rebre missatges SMS a través del teu coreu electrònic des de %%site.name"
"%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "L'SMS no és disponible."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adreça de missatgeria instantània"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Número de telèfon actualment confirmat i activat per SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Esperant confirmació per aquest número de telèfon."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Codi de confirmació"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Número de telèfon per als SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferències"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3946,23 +4138,34 @@ msgstr ""
"Enviar-me avisos a través de SMS; puc entendre que això repercutirà en una "
"exorbitant càrrega del meu transport."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "S'han desat les preferències."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "No hi ha cap número de telèfon."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "No s'ha sel·leccionat cap transport."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Aquest ja és el teu número de telèfon."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Aquest número de telèfon pertany a un altre usuari."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3972,23 +4175,42 @@ msgstr ""
"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
"instruccions per utilitzar-lo."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Aquest és un número de confirmació incorrecte."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmació cancel·lada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Aquest no és el teu número de telèfon."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Número de telèfon per als SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Transport mòbil"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Selecciona un transport"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3998,7 +4220,8 @@ msgstr ""
"accepti SMS a través del correu electrònic, però no està a la llista, "
"envia'ns un correu electrònic per fer-nos-ho saber %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "No hi ha cap codi entrat"
@@ -5225,10 +5448,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancel·la"
@@ -5304,34 +5525,40 @@ msgstr "Comanda fallida"
msgid "Notice with that id does not exist"
msgstr "No hi ha cap perfil amb aquesta id."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "L'usuari no té última nota"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Perdona, aquesta comanda no està implementada."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Reclamació enviada"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5339,202 +5566,206 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Nota marcada com a favorita."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Ja sou membre del grup."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "No s'ha pogut afegir l'usuari %s al grup %s."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s s'ha pogut afegir al grup %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ha abandonat el grup %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nom complet: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Pàgina web: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Sobre tu: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Missatge directe per a %s enviat"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Error al enviar el missatge directe."
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar aquesta nota"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Notificació publicada"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Problema en guardar l'avís."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "S'ha enviat la resposta a %s"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Problema en guardar l'avís."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica el nom de l'usuari a que vols subscriure't"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Subscrit a %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Comanda encara no implementada."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificacions off."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "No es poden posar en off les notificacions."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificacions on."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sou un membre d'aquest grup:"
msgstr[1] "Sou un membre d'aquests grups:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6384,6 +6615,10 @@ msgid "Repeat this notice?"
msgstr "Repeteix l'avís"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sí"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repeteix l'avís"
@@ -6575,47 +6810,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Modera"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "fa un any"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 8539429fd..ff1161373 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:21+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:20+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Žádný takový uživatel."
msgid "Save access settings"
msgstr "Nastavení"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -111,7 +116,7 @@ msgstr "Žádné takové oznámení."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Žádný takový uživatel."
@@ -347,7 +352,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "Toto je již vaše Jabber"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -469,7 +474,7 @@ msgstr "Žádný požadavek nebyl nalezen!"
msgid "You are already a member of that group."
msgstr "Již jste přihlášen"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -522,17 +527,17 @@ msgid "Invalid token."
msgstr "Neplatná velikost"
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -566,12 +571,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Nečekaná forma submission."
@@ -836,28 +844,45 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Ne"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ano"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -870,8 +895,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "Žádné takové oznámení."
@@ -933,16 +958,24 @@ msgstr "Neznámý typ adresy %s"
msgid "That address has already been confirmed."
msgstr "Adresa již byla potvrzena"
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Nelze aktualizovat uživatele"
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Nelze smazat potvrzení emailu"
@@ -1000,12 +1033,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Žádné takové oznámení."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Odstranit toto oznámení"
@@ -1039,12 +1074,14 @@ msgstr ""
msgid "Are you sure you want to delete this notice?"
msgstr ""
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
@@ -1068,7 +1105,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Odstranit tohoto uživatele"
@@ -1185,15 +1223,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Uložit"
@@ -1329,180 +1365,240 @@ msgstr "Nelze uložin informace o obrázku"
msgid "Options saved."
msgstr "Nastavení uloženo."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Nastavení E-mailu"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresa"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Potvrzení emailové adresy"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr ""
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Odstranit"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Zrušit"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Potvrzení emailové adresy"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Přidat"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nový"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Nastavení"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Nastavení uloženo"
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Nelze vložit potvrzující kód"
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nečeká žádné potvrzení na zrušení."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Toto je špatná IM adresa"
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Potvrď zrušení"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Adresa byla odstraněna"
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1702,17 +1798,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Nelze přesměrovat na server: %s"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "Žádný takový uživatel."
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1892,12 +1990,16 @@ msgstr "Uživatel nemá profil."
msgid "Error removing the block."
msgstr "Chyba při ukládaní uživatele"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "IM nastavení"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1906,16 +2008,26 @@ msgstr ""
"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
"%).Zadejte svou adresu níže."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM adresa"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Potvrzené Jabber/GTalk adresy"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1924,12 +2036,9 @@ msgstr ""
"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk "
"účtu. (Přidal jste si %s do vašich kontaktů?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresa"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1938,43 +2047,65 @@ msgstr ""
"Jabber nebo GTalk adresy, například \"jmeno@example.org\". Neprve se "
"ujistěte že jste přidal %s do vašeho seznamu kontaktů."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Nastavení"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Zasílat oznámení pomocí Jabber/GTalk"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Nastavení uloženo"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Žádné Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Nelze normalizovat JabberID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Není platným Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Toto je již vaše Jabber"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID již patří jinému uživateli"
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1983,10 +2114,35 @@ msgstr ""
"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
"posílání zpráv."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Toto je špatná IM adresa"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Nelze smazat potvrzení emailu"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Potvrď zrušení"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Toto není váš Jabber"
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adresa byla odstraněna"
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2027,7 +2183,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2122,7 +2280,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "Žádná přezdívka."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2131,12 +2291,14 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "Neodeslal jste nám profil"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1 statusů na %2"
@@ -2248,12 +2410,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Žádný obsah!"
@@ -2261,7 +2423,7 @@ msgstr "Žádný obsah!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2522,7 +2684,7 @@ msgid "6 or more characters"
msgstr "6 a více znaků"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Heslo znovu"
@@ -3877,99 +4039,160 @@ msgstr ""
msgid "Save site notice"
msgstr "Nové sdělení"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "IM nastavení"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM adresa"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Heslo znovu"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "Žádné telefonní číslo."
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Nastavení"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Nastavení uloženo"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Žádné telefonní číslo."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr "Tento potvrzující kód vám nepatří!"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Potvrď zrušení"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Žádné telefonní číslo."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5198,10 +5421,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Zrušit"
@@ -5278,35 +5499,41 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr "Vzdálený profil s nesouhlasícím profilem"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "Uživatel nemá profil."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nelze aktualizovat uživatele"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Nelze aktualizovat uživatele"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Odpovědi na %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5314,207 +5541,211 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "Již jste přihlášen"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1 statusů na %2"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "Nelze vytvořit OpenID z: %s"
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1 statusů na %2"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Celé jméno"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Odstranit toto oznámení"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Sdělení"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Problém při ukládání sdělení"
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Odpovědi na %s"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Problém při ukládání sdělení"
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Odhlásit"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6370,6 +6601,10 @@ msgid "Repeat this notice?"
msgstr "Odstranit toto oznámení"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ano"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Odstranit toto oznámení"
@@ -6565,47 +6800,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index b47c8be78..56db81a7f 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:24+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr "Geschlossen"
msgid "Save access settings"
msgstr "Zugangs-Einstellungen speichern"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Speichern"
@@ -111,7 +116,7 @@ msgstr "Seite nicht vorhanden"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Unbekannter Benutzer."
@@ -355,7 +360,7 @@ msgstr "Keine Nachricht mit dieser ID gefunden."
msgid "This status is already a favorite."
msgstr "Diese Nachricht ist bereits ein Favorit!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Konnte keinen Favoriten erstellen."
@@ -475,7 +480,7 @@ msgstr "Gruppe nicht gefunden!"
msgid "You are already a member of that group."
msgstr "Du bist bereits Mitglied dieser Gruppe"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Der Admin dieser Gruppe hat dich gesperrt."
@@ -526,17 +531,17 @@ msgid "Invalid token."
msgstr "Ungültiges Token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Unerwartete Formulareingabe."
@@ -837,27 +845,44 @@ msgstr ""
"Benutzer wird gelöscht, dieser kann dich in Zukunft nicht mehr abonnieren "
"und bekommt keine @-Antworten."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nein"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -870,8 +895,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Keine derartige Gruppe."
@@ -930,16 +955,24 @@ msgstr "Nicht erkannter Adresstyp %s"
msgid "That address has already been confirmed."
msgstr "Diese Adresse wurde bereits bestätigt."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Konnte Benutzerdaten nicht aktualisieren."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Konnte E-Mail-Bestätigung nicht löschen."
@@ -993,11 +1026,13 @@ msgstr ""
"Bist du sicher, dass du dieses Programm löschen willst? Es werden alle Daten "
"aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Dieses Programm nicht löschen"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Programm löschen"
@@ -1032,11 +1067,13 @@ msgstr "Notiz löschen"
msgid "Are you sure you want to delete this notice?"
msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -1060,7 +1097,8 @@ msgstr ""
"Bist du sicher, dass du den Benutzer löschen wisst? Alle Daten des Benutzers "
"werden aus der Datenbank gelöscht (ohne ein Backup)."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Diesen Benutzer löschen"
@@ -1173,15 +1211,13 @@ msgid "Reset back to default"
msgstr "Standard wiederherstellen"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Speichern"
@@ -1308,31 +1344,43 @@ msgstr "Konnte keinen Favoriten erstellen."
msgid "Options saved."
msgstr "Einstellungen gespeichert."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-Mail-Einstellungen"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-Mail-Adresse"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Aktuelle bestätigte E-Mail-Adresse."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Entfernen"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1340,110 +1388,145 @@ msgstr ""
"Warte auf die Bestätigung dieser Adresse. Prüfe Deinen Nachrichteneingang "
"(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Abbrechen"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-Mail-Adresse"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Hinzufügen"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Eingehende E-Mail"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
"deaktiviert."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Neu"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Einstellungen"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Informiere mich über neues Abonnements per E-Mail."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Einstellungen gesichert."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Design-Einstellungen gespeichert."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Keine E-Mail-Adresse."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Dies ist bereits deine E-Mail-Adresse."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Konnte keinen Bestätigungscode einfügen."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1452,43 +1535,56 @@ msgstr ""
"Überprüfe deinen Posteingang (auch den Spamordner!) für den Code und "
"Anweisungen, wie dieser benutzt wird."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Das ist die falsche IM-Adresse."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Bestätigung abgebrochen."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Dies ist nicht deine E-Mail-Adresse."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Die Adresse wurde entfernt."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Keine Eingangs-E-Mail-Adresse."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Konnte Nutzereintrag nicht schreiben"
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Eingehende E-Mail-Adresse entfernt"
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
@@ -1681,15 +1777,17 @@ msgstr ""
"abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten "
"können."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Diesen Nutzer von der Gruppe sperren"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
@@ -1873,11 +1971,15 @@ msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt."
msgid "Error removing the block."
msgstr "Fehler beim Freigeben des Benutzers."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-Einstellungen"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1886,15 +1988,24 @@ msgstr ""
"Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
"senden. Stelle deine Adresse und Einstellungen unten ein."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM ist nicht verfügbar."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-Adresse"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1904,11 +2015,9 @@ msgstr ""
"sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner "
"Freundesliste hinzugefügt?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-Adresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1918,45 +2027,67 @@ msgstr ""
"Aber versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM-"
"Programm oder GTalk aufgenommen hast."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Einstellungen"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
"GTalk."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Einstellungen gesichert."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Keine Jabber-ID"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Konnte diese Jabber ID nicht normalisieren"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Ungültige Jabber-ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Diese JabberID hast du schon angegeben."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1965,10 +2096,35 @@ msgstr ""
"Ein Bestätigungscode wurde an die IM-Adresse geschickt, die du hinzugefügt "
"hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Das ist die falsche IM-Adresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Konnte E-Mail-Bestätigung nicht löschen."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bestätigung abgebrochen."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Dies ist nicht deine JabberID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Die Adresse wurde entfernt."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2011,7 +2167,9 @@ msgstr "Lade neue Leute ein"
msgid "You are already subscribed to these users:"
msgstr "Du hast diese Benutzer bereits abonniert:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2138,7 +2296,9 @@ msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
msgid "No nickname or ID."
msgstr "Kein Benutzername oder ID"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s ist der Gruppe %2$s beigetreten"
@@ -2147,11 +2307,13 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten"
msgid "You must be logged in to leave a group."
msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Du bist kein Mitglied dieser Gruppe."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
@@ -2262,12 +2424,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
msgid "New message"
msgstr "Neue Nachricht"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Kein Inhalt!"
@@ -2275,7 +2437,7 @@ msgstr "Kein Inhalt!"
msgid "No recipient specified."
msgstr "Kein Empfänger angegeben."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2539,7 +2701,7 @@ msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Bestätigen"
@@ -3943,44 +4105,74 @@ msgstr "Systembenachrichtigung (max. 255 Zeichen; HTML erlaubt)"
msgid "Save site notice"
msgstr "Systemnachricht speichern"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS-Einstellungen"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS ist nicht verfügbar."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-Adresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Aktuelle für den SMS-Dienst bestätigte Telefonnummer."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Warte auf die Bestätigung dieser Telefonnummer."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Bestätigungscode"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS-Telefonnummer"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Einstellungen"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3988,23 +4180,34 @@ msgstr ""
"Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
"meinem Netzbetreiber entstehen können."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Einstellungen gesichert."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Keine Telefonnummer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Kein Netzanbieter ausgewählt."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Dies ist bereits deine Telefonnummer."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4013,23 +4216,42 @@ msgstr ""
"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
"den Code und die Anweisungen, um ihn zu benutzen."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Die Bestätigungsnummer ist falsch."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bestätigung abgebrochen."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Dies ist nicht deine Telefonnummer."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-Telefonnummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Netzanbieter"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Wähle einen Netzanbieter"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4039,7 +4261,8 @@ msgstr ""
"Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter %"
"s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Kein Code eingegeben"
@@ -5242,10 +5465,8 @@ msgstr ""
"Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/"
"Schreibzugriff"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Abbrechen"
@@ -5321,34 +5542,40 @@ msgstr "Befehl fehlgeschlagen"
msgid "Notice with that id does not exist"
msgstr "Nachricht mit dieser ID existiert nicht"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Benutzer hat keine letzte Nachricht"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Leider ist dieser Befehl noch nicht implementiert."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Stups an %s geschickt"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5359,57 +5586,55 @@ msgstr ""
"Abonnenten: %2$s\n"
"Mitteilungen: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Nachricht als Favorit markiert."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Du bist bereits Mitglied dieser Gruppe"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ist der Gruppe %s beigetreten"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s hat die Gruppe %s verlassen"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Vollständiger Name: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Über: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5418,138 +5643,145 @@ msgstr ""
"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf "
"dem selben Server senden."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direkte Nachricht an %s abgeschickt"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Fehler beim Senden der Nachricht"
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Nachricht bereits wiederholt"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Nachricht von %s wiederholt"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Fehler beim Wiederholen der Nachricht"
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Antwort an %s gesendet"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Problem beim Speichern der Nachricht."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "OMB Profile können nicht mit einem Kommando abonniert werden."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "%s abonniert"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Befehl noch nicht implementiert."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Benachrichtigung deaktiviert."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Konnte Benachrichtigung nicht deaktivieren."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Benachrichtigung aktiviert."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Anmeldung ist abgeschaltet"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Du hast niemanden abonniert."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du bist Mitglied dieser Gruppe:"
msgstr[1] "Du bist Mitglied dieser Gruppen:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6494,6 +6726,10 @@ msgid "Repeat this notice?"
msgstr "Diese Nachricht wiederholen?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Diese Nachricht wiederholen"
@@ -6679,47 +6915,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 17a78c456..e449fbac9 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:29+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:27+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Κλειστό"
msgid "Save access settings"
msgstr "Αποθήκευση ρυθμίσεων πρόσβασης"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Αποθήκευση"
@@ -106,7 +111,7 @@ msgstr "Δεν υπάρχει τέτοια σελίδα"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Κανένας τέτοιος χρήστης."
@@ -343,7 +348,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -465,7 +470,7 @@ msgstr "Η ομάδα δεν βρέθηκε!"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -517,17 +522,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -821,28 +829,45 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Όχι"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ναι"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -855,8 +880,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -916,16 +941,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Απέτυχε η ενημέρωση του χρήστη."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
@@ -982,12 +1015,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Περιγράψτε την ομάδα ή το θέμα"
@@ -1022,12 +1057,14 @@ msgstr "Διαγραφή μηνύματος"
msgid "Are you sure you want to delete this notice?"
msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr ""
@@ -1050,7 +1087,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Διαγράψτε αυτόν τον χρήστη"
@@ -1164,15 +1202,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
@@ -1308,32 +1344,44 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
msgid "Options saved."
msgstr ""
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Ρυθμίσεις Email"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Διεύθυνση"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Διευθύνσεις email"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
msgid "Remove"
msgstr ""
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
#, fuzzy
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
@@ -1342,107 +1390,140 @@ msgstr ""
"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το mail σου (και το "
"φάκελο spam!) για μήνυμα με περαιτέρω οδηγίες. "
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Ακύρωση"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Διευθύνσεις email"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Διεύθυνση email, π.χ: \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Προσθήκη"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Εισερχόμενο email"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
msgid "New"
msgstr ""
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Προτιμήσεις"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1451,43 +1532,56 @@ msgstr ""
"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
-msgstr ""
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Η επιβεβαίωση ακυρώθηκε."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
-msgstr ""
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1677,15 +1771,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1858,28 +1954,42 @@ msgstr ""
msgid "Error removing the block."
msgstr ""
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Ρυθμίσεις ΙΜ"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Διεύθυνση ΙΜ"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, fuzzy, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1889,55 +1999,74 @@ msgstr ""
"λογαριασμό σου για μήνυμα με περαιτέρω οδηγίες. (Πρόσθεσες το χρήστη %s στη "
"λίστα φίλων?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Διεύθυνση ΙΜ"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Προτιμήσεις"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr ""
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr ""
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr ""
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1946,10 +2075,35 @@ msgstr ""
"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διεύθυνση IM που προσθέσατε. "
"Πρέπει να αποδεχτείτε τον/την %s για αποστολή μηνυμάτων προς εσας. "
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Η επιβεβαίωση ακυρώθηκε."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr ""
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1990,7 +2144,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2084,7 +2240,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "Μήνυμα"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2093,11 +2251,13 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr ""
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -2209,12 +2369,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr ""
@@ -2222,7 +2382,7 @@ msgstr ""
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2478,7 +2638,7 @@ msgid "6 or more characters"
msgstr "6 ή περισσότεροι χαρακτήρες"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Επιβεβαίωση"
@@ -3827,68 +3987,109 @@ msgstr ""
msgid "Save site notice"
msgstr "Ρυθμίσεις OpenID"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "Ρυθμίσεις ΙΜ"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Διεύθυνση ΙΜ"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Τρέχων επιβεβαιωμένο, μέσω SMS, νούμερο κινητού τηλεφώνου."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Προτιμήσεις"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3898,30 +4099,49 @@ msgstr ""
"προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
"αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Η επιβεβαίωση ακυρώθηκε."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5108,10 +5328,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Ακύρωση"
@@ -5186,34 +5404,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr ""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5221,200 +5445,204 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "ομάδες των χρηστών %s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "ομάδες των χρηστών %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Ονοματεπώνυμο"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Ρυθμίσεις OpenID"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Απέτυχε η συνδρομή."
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
msgstr[1] "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6248,6 +6476,10 @@ msgid "Repeat this notice?"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ναι"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
@@ -6439,47 +6671,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Συντονιστής"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index c8c06c174..fd16a8bf7 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:33+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:30+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Closed"
msgid "Save access settings"
msgstr "Save access settings"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -107,7 +112,7 @@ msgstr "No such page"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No such user."
@@ -350,7 +355,7 @@ msgstr "No status found with that ID."
msgid "This status is already a favorite."
msgstr "This status is already a favourite."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Could not create favourite."
@@ -467,7 +472,7 @@ msgstr "Group not found!"
msgid "You are already a member of that group."
msgstr "You are already a member of that group."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "You have been blocked from that group by the admin."
@@ -518,17 +523,17 @@ msgid "Invalid token."
msgstr "Invalid token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "The request token %s has been denied and revoked."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Unexpected form submission."
@@ -825,27 +833,44 @@ msgstr ""
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Do not block this user"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -858,8 +883,8 @@ msgstr "Failed to save block information."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "No such group."
@@ -918,16 +943,24 @@ msgstr "Unrecognised address type %s"
msgid "That address has already been confirmed."
msgstr "That address has already been confirmed."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Couldn't update user."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Couldn't delete e-mail confirmation."
@@ -982,11 +1015,13 @@ msgstr ""
"about the application from the database, including all existing user "
"connections."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Do not delete this application"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Delete this application"
@@ -1021,11 +1056,13 @@ msgstr "Delete notice"
msgid "Are you sure you want to delete this notice?"
msgstr "Are you sure you want to delete this notice?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -1049,7 +1086,8 @@ msgstr ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Delete this user"
@@ -1162,15 +1200,13 @@ msgid "Reset back to default"
msgstr "Reset back to default"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Save"
@@ -1296,31 +1332,43 @@ msgstr "Could not create aliases"
msgid "Options saved."
msgstr "Options saved."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-mail settings"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Manage how you get e-mail from %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Address"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mail address"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Current confirmed e-mail address."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Remove"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1328,106 +1376,141 @@ msgstr ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mail address"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mail address, like \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Add"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Incoming e-mail"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send e-mail to this address to post new notices."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Make a new e-mail address for posting to - cancels the old one."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "New"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferences"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Send me notices of new subscriptions through e-mail."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send me e-mail when someone adds my notice as a favourite."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Send me e-mail when someone sends me a private message."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send me e-mail when someone sends me an \"@-reply\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Allow friends to nudge me and send me an e-mail."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "I want to post notices by e-mail."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publish a MicroID for my e-mail address."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Design preferences saved."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "No e-mail address."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "That is already your e-mail address."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "That e-mail address already belongs to another user."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Couldn't insert confirmation code."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1435,43 +1518,56 @@ msgstr ""
"A confirmation code was sent to the e-mail address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "No pending confirmation to cancel."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "That is the wrong IM address."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmation cancelled."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "That is not your e-mail address."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "The address was removed."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No incoming e-mail address."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Couldn't update user record."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Incoming e-mail address removed."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "New incoming e-mail address added."
@@ -1665,15 +1761,17 @@ msgstr ""
"will be removed from the group, unable to post and unable to subscribe to "
"the group in the future."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Do not block this user from this group"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Block this user from this group"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Database error blocking user from group."
@@ -1851,11 +1949,15 @@ msgstr "User is not blocked from group."
msgid "Error removing the block."
msgstr "Error removing the block."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM settings"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1864,15 +1966,24 @@ msgstr ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM is not available."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM address"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Current confirmed Jabber/GTalk address."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1881,11 +1992,9 @@ msgstr ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM address"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1894,44 +2003,66 @@ msgstr ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferences"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Send me notices through Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Post a notice when my Jabber/GTalk status changes."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Send me replies through Jabber/GTalk from people I'm not subscribed to."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publish a MicroID for my Jabber/GTalk address."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferences saved."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "No Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Cannot normalise Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Not a valid Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "That is already your Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID already belongs to another user."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1940,10 +2071,35 @@ msgstr ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "That is the wrong IM address."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Couldn't delete e-mail confirmation."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation cancelled."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "That is not your Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "The address was removed."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1984,7 +2140,9 @@ msgstr "Invite new users"
msgid "You are already subscribed to these users:"
msgstr "You are already subscribed to these users:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2108,7 +2266,9 @@ msgstr "You must be logged in to join a group."
msgid "No nickname or ID."
msgstr "No nickname or ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s joined group %2$s"
@@ -2117,11 +2277,13 @@ msgstr "%1$s joined group %2$s"
msgid "You must be logged in to leave a group."
msgstr "You must be logged in to leave a group."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "You are not a member of that group."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
@@ -2231,12 +2393,12 @@ msgstr "Use this form to create a new group."
msgid "New message"
msgstr "New message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "You can't send a message to this user."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "No content!"
@@ -2244,7 +2406,7 @@ msgstr "No content!"
msgid "No recipient specified."
msgstr "No recipient specified."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2500,7 +2662,7 @@ msgid "6 or more characters"
msgstr "6 or more characters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirm"
@@ -3867,45 +4029,75 @@ msgstr ""
msgid "Save site notice"
msgstr "Site notice"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS settings"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "You can receive SMS messages through e-mail from %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "This page is not available in a "
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM address"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Current confirmed SMS-enabled phone number."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Awaiting confirmation on this phone number."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Confirmation code"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Enter the code you received on your phone."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirm"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS phone number"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Phone number, no punctuation or spaces, with area code"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferences"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3913,23 +4105,34 @@ msgstr ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferences saved."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "No phone number."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "No carrier selected."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "That is already your phone number."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "That phone number already belongs to another user."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3937,23 +4140,42 @@ msgstr ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "That is the wrong confirmation number."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation cancelled."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "That is not your phone number."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS phone number"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Mobile carrier"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Select a carrier"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3962,7 +4184,8 @@ msgstr ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "No code entered"
@@ -5162,10 +5385,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancel"
@@ -5239,34 +5460,40 @@ msgstr "Command failed"
msgid "Notice with that id does not exist"
msgstr "Notice with that id does not exist"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "User has no last notice"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Could not find a user with nickname %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Could not find a user with nickname %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Sorry, this command is not yet implemented."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Nudge sent to %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5274,196 +5501,200 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Notice marked as fave."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "You are already a member of that group."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Could not join user %s to group %s."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s joined group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Could not join user %1$s to group %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Could not remove user %s to group %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s left group %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Fullname: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "About: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direct message to %s sent"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Error sending direct message."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Cannot repeat your own notice."
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Already repeated that notice."
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Notice from %s repeated"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Error repeating notice."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Notice too long - maximum is %d characters, you sent %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Reply to %s sent"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Error saving notice."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribed to %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specify the name of the user to unsubscribe from"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Unsubscribed from %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Command not yet implemented."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notification off."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Can't turn off notification."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notification on."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Unsubscribed %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to anyone."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "No one is subscribed to you."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "You are not a member of any groups."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6305,6 +6536,10 @@ msgid "Repeat this notice?"
msgstr "Repeat this notice?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Yes"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repeat this notice"
@@ -6492,47 +6727,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index f714ea20f..117947d5a 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:36+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:33+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "Cerrado"
msgid "Save access settings"
msgstr "Guardar la configuración de acceso"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Guardar"
@@ -107,7 +112,7 @@ msgstr "No existe tal página."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "No existe ese usuario."
@@ -348,7 +353,7 @@ msgstr "No se encontró estado para ese ID"
msgid "This status is already a favorite."
msgstr "Este status ya está en favoritos."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "No se pudo crear favorito."
@@ -466,7 +471,7 @@ msgstr "Grupo no encontrado."
msgid "You are already a member of that group."
msgstr "Ya eres miembro de ese grupo"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Has sido bloqueado de ese grupo por el administrador."
@@ -517,17 +522,17 @@ msgid "Invalid token."
msgstr "Token inválido."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -563,12 +568,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "El token de solicitud %2 ha sido denegado y revocado."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
@@ -828,27 +836,44 @@ msgstr ""
"desuscribirá de tu cuenta, no podrá suscribirse a ella en el futuro y no se "
"te notificará de ninguna de sus respuestas @."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquear a este usuario"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -861,8 +886,8 @@ msgstr "No se guardó información de bloqueo."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "No existe ese grupo."
@@ -922,16 +947,24 @@ msgstr "Tipo de dirección %s desconocida."
msgid "That address has already been confirmed."
msgstr "Esa dirección ya fue confirmada."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "No se pudo actualizar el usuario."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "No se pudo eliminar la confirmación de correo electrónico."
@@ -986,11 +1019,13 @@ msgstr ""
"los datos acerca de la aplicación de la base de datos, incluyendo todas las "
"conexiones de usuario existente."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "No eliminar esta aplicación"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Borrar esta aplicación"
@@ -1025,11 +1060,13 @@ msgstr "Borrar aviso"
msgid "Are you sure you want to delete this notice?"
msgstr "¿Estás seguro de que quieres eliminar este aviso?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "No eliminar este mensaje"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -1053,7 +1090,8 @@ msgstr ""
"¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
"todos los datos sobre el usuario, sin dejar una copia de seguridad."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Borrar este usuario"
@@ -1166,15 +1204,13 @@ msgid "Reset back to default"
msgstr "Volver a los valores predeterminados"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Guardar"
@@ -1300,31 +1336,43 @@ msgstr "No fue posible crear alias."
msgid "Options saved."
msgstr "Se guardó Opciones."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Configuración del correo electrónico"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Dirección"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Dirección de correo electrónico"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Actual dirección de correo electrónico confirmada"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Eliminar"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1332,109 +1380,144 @@ msgstr ""
"Esperando confirmación de esta dirección. Revisa tu bandeja de entrada (¡y "
"la de spam!) por un mensaje con las instrucciones."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Dirección de correo electrónico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Correo electrónico, como \"NombredeUsuario@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Añadir"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo entrante"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nuevo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferencias"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Enviarme avisos de suscripciones nuevas por correo."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir que amigos me contacten y envién un correo."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Deseo enviar estados por email"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicar un MicroID para mi dirección de correo."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferencias guardadas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferencias de diseño guardadas."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Sin dirección de correo electrónico"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Esa ya es tu dirección de correo electrónico"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Esa dirección de correo pertenece a otro usuario."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "No se pudo insertar el código de confirmación."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1443,43 +1526,56 @@ msgstr ""
"Revisa tu bandeja de entrada (¡y la de spam!) para encontrar el código y las "
"instrucciones sobre cómo usarlo."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ninguna confirmación pendiente para cancelar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Esa dirección de mensajería instantánea es incorrecta."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmación cancelada."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Esa no es tu dirección de correo electrónico"
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "La dirección fue eliminada."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No hay dirección de correo entrante."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "No se pudo actualizar información de usuario."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante removida."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nueva dirección de correo entrante agregada."
@@ -1670,15 +1766,17 @@ msgstr ""
"eliminará del grupo y no podrá publicar ni suscribirse al grupo en lo "
"sucesivo."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "No bloquear este usuario de este grupo"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Bloquear este usuario de este grupo"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
"Se ha producido un error en la base de datos al bloquear el usuario del "
@@ -1863,11 +1961,15 @@ msgstr "El usuario no está bloqueado del grupo."
msgid "Error removing the block."
msgstr "Se ha producido un error al eliminar el bloque."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Configuración de mensajería instantánea"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1876,15 +1978,24 @@ msgstr ""
"Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
"Jabber/GTalk. Configura tu dirección y opciones abajo."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "La mensajería instantánea no está disponible."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Dirección de mensajería instantánea"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Dirección actual Jabber/Gtalk confirmada."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1894,11 +2005,9 @@ msgstr ""
"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
"de amigos?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Dirección de mensajería instantánea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1908,44 +2017,66 @@ msgstr ""
"Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
"mensajería instantánea o en GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Enviarme avisos por Jabber/GTalk"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferencias guardadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Ningún Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "No se puede normalizar este Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Jabber ID no válido"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Ese ya es tu Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "El Jabber ID ya pertenece a otro usuario."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1955,10 +2086,35 @@ msgstr ""
"instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
"mensajes."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esa dirección de mensajería instantánea es incorrecta."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "No se pudo eliminar la confirmación de correo electrónico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmación cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Ese no es tu Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "La dirección fue eliminada."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2000,7 +2156,9 @@ msgstr "Invitar nuevos usuarios:"
msgid "You are already subscribed to these users:"
msgstr "Ya estás suscrito a estos usuarios:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2123,7 +2281,9 @@ msgstr "Debes estar conectado para unirte a un grupo."
msgid "No nickname or ID."
msgstr "Ningún nombre de usuario o ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s se ha unido al grupo %2$"
@@ -2132,11 +2292,13 @@ msgstr "%1$s se ha unido al grupo %2$"
msgid "You must be logged in to leave a group."
msgstr "Debes estar conectado para dejar un grupo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "No eres miembro de este grupo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
@@ -2248,12 +2410,12 @@ msgstr "Usa este formulario para crear un grupo nuevo."
msgid "New message"
msgstr "Nuevo Mensaje "
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "No puedes enviar mensaje a este usuario."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "¡Ningún contenido!"
@@ -2261,7 +2423,7 @@ msgstr "¡Ningún contenido!"
msgid "No recipient specified."
msgstr "No se especificó receptor."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
@@ -2521,7 +2683,7 @@ msgid "6 or more characters"
msgstr "6 o más caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -3922,45 +4084,75 @@ msgstr ""
msgid "Save site notice"
msgstr "Guardar el aviso del sitio"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Configuración de SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Puedes recibir mensajes SMS por correo electrónico desde %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS no está disponible."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Dirección de mensajería instantánea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Actual número telefónico para SMS confirmado."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Esperando confirmación de este número de teléfono."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Código de confirmación"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Ingrese el código recibido en su teléfono"
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Número de teléfono de SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Número telefónico, sin puntuación ni espacios, incluya código de área"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3968,23 +4160,34 @@ msgstr ""
"Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
"mi operador móvil"
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferencias guardadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Sin número telefónico"
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "No se seleccionó un operador móvil."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Ese ya es tu número telefónico"
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Ese número telefónico ya pertenece a otro usuario"
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3993,23 +4196,42 @@ msgstr ""
"Revisa tu teléfono para encontrar el código y las instrucciones acerca de "
"cómo usarlo."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Ese no es el número de confirmación"
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmación cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Ese no es tu número telefónico"
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Número de teléfono de SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operador de telefonía móvil"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Seleccione un operador móvil"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4019,7 +4241,8 @@ msgstr ""
"sobre correo electrónico pero no está listado aquí, envíanos un correo para "
"informarnos al %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "No ingresó código"
@@ -5220,10 +5443,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancelar"
@@ -5299,35 +5520,41 @@ msgstr "Comando falló"
msgid "Notice with that id does not exist"
msgstr "No existe ningún mensaje con ese id"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Usuario no tiene último aviso"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
"No se pudo encontrar a ningún usuario local con el nombre de usuario %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Disculpa, todavía no se implementa este comando."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "¡No tiene sentido darte un toque a ti mismo!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "zumbido enviado a %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5338,57 +5565,55 @@ msgstr ""
"Suscriptores: %2$s\n"
"Avisos: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Aviso marcado como favorito."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Ya eres parte de ese grupo"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "No se pudo unir el usuario %s al grupo %s"
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s se unió a grupo %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "No se pudo eliminar al usuario %s del grupo %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s dejó grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nombre completo: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5397,139 +5622,145 @@ msgstr ""
"%s es un perfil remoto: sólo puedes enviarle mensajes directos a usuarios en "
"el mismo servidor."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Se envió mensaje directo a %s"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Error al enviar mensaje directo."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "No puedes repetir tu propio aviso"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Ya has repetido este aviso"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Aviso de %s repetido"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Ha habido un error al repetir el aviso."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Responder a %s enviados"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Error al guardar el aviso."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Especificar el nombre del usuario a suscribir"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "No te puedes suscribir a perfiles de OMB por orden."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especificar el nombre del usuario para desuscribirse de"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Todavía no se implementa comando."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificación no activa."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "No se puede desactivar notificación."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificación activada."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "El comando de inicio de sesión está desactivado"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Este enlace es utilizable solamente una vez y sólo válido por 2 minutos: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Eres miembro de este grupo:"
msgstr[1] "Eres miembro de estos grupos:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6389,6 +6620,10 @@ msgid "Repeat this notice?"
msgstr "Responder este aviso?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sí"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Responder este aviso."
@@ -6577,47 +6812,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderador"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index db5deb6e3..00af27de4 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:52+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:39+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -75,8 +75,13 @@ msgstr "مسدود"
msgid "Save access settings"
msgstr "ذخیره‌ی تنظیمات دسترسی"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "ذخیره"
@@ -107,7 +112,7 @@ msgstr "چنین صفحه‌ای وجود ندارد"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "چنین کاربری وجود ندارد."
@@ -344,7 +349,7 @@ msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
msgid "This status is already a favorite."
msgstr "این پیغام را پیش‌تر به علایق خود اضافه کرده‌اید"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "نمی‌توان وضعیت را موردعلاقه کرد."
@@ -461,7 +466,7 @@ msgstr "گروه یافت نشد!"
msgid "You are already a member of that group."
msgstr "شما از پیش یک عضو این گروه هستید."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
@@ -513,17 +518,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -555,12 +560,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "ارسال غیر قابل انتظار فرم."
@@ -821,27 +829,44 @@ msgstr ""
"دنبال کند. همچنین دیگر شما از پیام‌هایی که در آن از شما یاد می‌کند با خبر "
"نخواهید شد"
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "خیر"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "بله"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "کاربر را مسدود کن"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -854,8 +879,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "چنین گروهی وجود ندارد."
@@ -914,16 +939,24 @@ msgstr "نوع نشانی نامشخص است %s"
msgid "That address has already been confirmed."
msgstr "آن نشانی در حال حاضر تصدیق شده است."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "نمی‌توان کاربر را به روز کرد."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
@@ -983,12 +1016,14 @@ msgstr ""
"آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات "
"پاک و بدون برگشت خواهند بود."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "این پیام را پاک نکن"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "این پیام را پاک کن"
@@ -1024,11 +1059,13 @@ msgstr "پیام را پاک کن"
msgid "Are you sure you want to delete this notice?"
msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "این پیام را پاک نکن"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
@@ -1052,7 +1089,8 @@ msgstr ""
"آیا مطمئن هستید که می‌خواهید این کاربر را پاک کنید؟ با این کار تمام اطلاعات "
"پاک و بدون برگشت خواهند بود."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "حذف این کاربر"
@@ -1165,15 +1203,13 @@ msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "ذخیره‌کردن"
@@ -1309,139 +1345,186 @@ msgstr "نمی‌توان نام‌های مستعار را ساخت."
msgid "Options saved."
msgstr "گزینه‌ها ذخیره شدند."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "تنظیمات پست الکترونیک"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "چگونگی دریافت نامه از %%site.name%% را اداره کنید."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "نشانی"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "نشانی‌های پست الکترونیکی"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "حذف"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "انصراف"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "نشانی‌های پست الکترونیکی"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "نشانی پست الکترونیکی، مانند «UserName@example.org»"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "افزودن"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "پست الکترونیک ورودی"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "برای ارسال پیام با استفاده از پست الکترونیک به این نشانی نامه بفرستید."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "نشانی جدید برای ارسال پیام ایجاد کن؛ نشانی قبلی فسخ می‌شود."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "جدید"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "ترجیحات"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"هر وقت کسی پیام های مرا دوست داشتنی کرد، مرا با پست اکترونیک با خبر کن."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "هر وقت کسی از من در پیام خود یاد کرد، مرا با پست الکترونیک با خبر کن."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "اجازه بده دوستان توجه مرا جذب کنند و به من نامه بفرستند."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "می‌خواهم با نامه پیام ارسال کنم."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "یک شناسه برای پست الکترونیک من منتشر کن."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "تنظیمات ذخیره شد."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ترجیحات طرح ذخیره شد."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "پست الکترونیک وجود ندارد."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "یک آدرس ایمیل معتبر نیست."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "هم اکنون نشانی شما همین است."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "نمی‌توان کد تایید را اضافه کرد."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1449,43 +1532,56 @@ msgstr ""
"کد تایید به نشانی شما ارسال شد. نامه های خود را بررسی کنید برای کد تایید و "
"راه استفاده."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "نشانی پیام رسان اشتباه است."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "تایید فسخ شد."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "آن نشانی شما نیست."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "نشانی پاک شده است."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "هیچ نشانی ورودی وجود ندارد."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "نشانی ورودی پاک شد."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "نشانی ورودی جدید اضافه شد."
@@ -1675,15 +1771,17 @@ msgid ""
"the group in the future."
msgstr "آیا مطمئن هستید می‌خواهید دسترسی »%s« را به گروه »%s« مسدود کنید؟"
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "دسترسی کاربر به گروه را مسدود نکن"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "دسترسی کاربر را به گروه مسدود کن"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
@@ -1860,12 +1958,16 @@ msgstr "کاربر از گروه منع نشده است."
msgid "Error removing the block."
msgstr "اشکال در پاکسازی"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "تنظیمات پیام‌رسان فوری"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1874,15 +1976,25 @@ msgstr ""
"شما می‌توانید پیام‌های خود را با استفاده از [پیام‌رسان‌های](%%doc.im%%) Jabber "
"یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید"
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "پیام‌رسان فوری در دسترس نیست."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "نشانی پیام‌رسان فوری"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "نشانی Jabber/GTalk تایید شده کنونی"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1891,12 +2003,9 @@ msgstr ""
"منتظر تایید این نشانی هستیم. لطفا Jabber/Gtalk خود را برای دریافت توضیحات "
"بیش‌تر بررسی کنید. (آیا %s را به فهرست خود اضافه کرده اید؟) "
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "نشانی پیام‌رسان فوری"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1905,44 +2014,66 @@ msgstr ""
"نشانی Jabber یا GTalk، مانند «UserName@example.org». ابتدا از اضافه کردن %s "
"به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ترجیحات"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "آگهی‌ها را از راه Jabber/GTalk برای من بفرست."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "هر وقت که وضعیت Jabber/Gtalk من فرق کرد، یک پیام ارسال کن."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"جواب کسانی که من آن ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم ارسال کن."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "یک شناسه‌ی کوچک برای Jabber/Gtalk من منتشر کن."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "تنظیمات ذخیره شد."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "هیچ شناسهٔ Jabber ای وجود ندارد."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "نمی‌توان شناسه‌ی Jabber را تایید کرد"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "شناسه‌ی Jabber درست نیست"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "این شناسه Jabber کنونی شماست."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "شناسه Jabber به یک کاربر دیگر مربوط است."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1951,10 +2082,35 @@ msgstr ""
"کد تایید به پیام‌رسان شما ارسال شد. شما باید %s را تایید کنید تا پیام‌ها به "
"شما ارسال شود."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "نشانی پیام رسان اشتباه است."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "تایید فسخ شد."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "این شناسه‌ی Jabber شما نیست."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "نشانی پاک شده است."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1995,7 +2151,9 @@ msgstr "دعوت کردن کاربران تازه"
msgid "You are already subscribed to these users:"
msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2093,7 +2251,9 @@ msgstr "برای پیوستن به یک گروه، باید وارد شده با
msgid "No nickname or ID."
msgstr "بدون لقب."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "ملحق شدن به گروه"
@@ -2102,11 +2262,13 @@ msgstr "ملحق شدن به گروه"
msgid "You must be logged in to leave a group."
msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "شما یک کاربر این گروه نیستید."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s گروه %s را ترک کرد."
@@ -2220,12 +2382,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا
msgid "New message"
msgstr "پیام جدید"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "شما نمی توانید به این کاربر پیام بفرستید."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "بدون محتوا!"
@@ -2233,7 +2395,7 @@ msgstr "بدون محتوا!"
msgid "No recipient specified."
msgstr "هیچ گیرنده ای مشخص نشده"
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -2499,7 +2661,7 @@ msgid "6 or more characters"
msgstr "۶ نویسه یا بیش‌تر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "تایید"
@@ -3833,68 +3995,109 @@ msgstr ""
msgid "Save site notice"
msgstr "خبر سایت"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "تنظیمات پیام‌رسان فوری"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr ""
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "نشانی پیام‌رسان فوری"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "منتظر تاییدیه برای این شماره تلفن."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "کد تاییدیه"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "کدی را که در گوشیتان گرفتید وارد کنید."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "تایید"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "شماره تماس پیامک"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ترجیحات"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "تنظیمات ذخیره شد."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "بدون شماره تلفن."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "آن قبلا شماره تلفن شما بوده است."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "أن شماره تلفن پیش از این به کاربر دیگری تعلق داشته است."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3902,30 +4105,50 @@ msgstr ""
"یک کد تاییدیه به شماره تلفنی که شما وارد کردید ارسال شد. گوشیتان را بررسی "
"کنید برای کد و دستورالعمل چگونگی استفاده از آن."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "آن کد تاییدیه ی نادرست است."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "تایید فسخ شد."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "آن شماره تلفن شما نیست."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "شماره تماس پیامک"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "امواج موبایل"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "کدی وارد نشد"
@@ -5108,10 +5331,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "انصراف"
@@ -5187,34 +5408,40 @@ msgstr "فرمان شکست خورد"
msgid "Notice with that id does not exist"
msgstr "خبری با این مشخصه ایجاد نشد"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "کاربر آگهی آخر ندارد"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "پیدا نشد %s کاریری یا نام مستعار"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "پیدا نشد %s کاریری یا نام مستعار"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "متاسفانه این دستور هنوز اجرا نشده."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "فرتادن اژیر"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5225,197 +5452,201 @@ msgstr ""
"مشترک : %2$s\n"
"خبر : %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "شما از پیش یک عضو این گروه هستید."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "عضویت %s در گروه %s نا موفق بود."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "ملحق شدن به گروه"
-
-#: lib/command.php:373
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "خارج شدن %s از گروه %s نا موفق بود"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s گروه %s را ترک کرد."
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "نام کامل : %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "موقعیت : %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "صفحه خانگی : %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "درباره ی : %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
"تا فرستادید"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "پیام مستقیم به %s فرستاده شد."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "خطا در فرستادن پیام مستقیم."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "نمی توان آگهی خودتان را تکرار کرد"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "آن آگهی قبلا تکرار شده است."
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "آگهی تکرار شد"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "خطا هنگام تکرار آگهی."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
"تا فرستادید"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "به این آگهی جواب دهید"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "خطا هنگام ذخیره ی آگهی"
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "شما به این پروفيل متعهد نشدید"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "دستور هنوز اجرا نشده"
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "ناتوان در خاموش کردن آگاه سازی."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "آگاه سازی فعال است."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "ناتوان در روشن کردن آگاه سازی."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "فرمان ورود از کار افتاده است"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "مشترک‌ها"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "شما یک عضو این گروه نیستید."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6251,6 +6482,10 @@ msgid "Repeat this notice?"
msgstr "به این آگهی جواب دهید"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "بله"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr ""
@@ -6437,47 +6672,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 0b3699420..c01631607 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:48+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:36+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -80,8 +80,13 @@ msgstr "Estä"
msgid "Save access settings"
msgstr "Profiilikuva-asetukset"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -113,7 +118,7 @@ msgstr "Sivua ei ole."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Käyttäjää ei ole."
@@ -356,7 +361,7 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
msgid "This status is already a favorite."
msgstr "Tämä päivitys on jo suosikki!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Ei voitu lisätä suosikiksi."
@@ -479,7 +484,7 @@ msgstr "Ryhmää ei löytynyt!"
msgid "You are already a member of that group."
msgstr "Sinä kuulut jo tähän ryhmään."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
@@ -531,17 +536,17 @@ msgid "Invalid token."
msgstr "Koko ei kelpaa."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -577,12 +582,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Odottamaton lomakkeen lähetys."
@@ -842,27 +850,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Ei"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Kyllä"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -875,8 +900,8 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Tuota ryhmää ei ole."
@@ -935,16 +960,24 @@ msgstr "Tuntematon osoitetyyppi %s "
msgid "That address has already been confirmed."
msgstr "Tämä osoite on jo vahvistettu."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Ei voitu päivittää käyttäjää."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Ei voitu poistaa sähköpostivahvistusta."
@@ -1002,12 +1035,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Älä poista tätä päivitystä"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Poista tämä päivitys"
@@ -1043,11 +1078,13 @@ msgstr "Poista päivitys"
msgid "Are you sure you want to delete this notice?"
msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -1070,7 +1107,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Poista tämä päivitys"
@@ -1189,15 +1227,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Tallenna"
@@ -1336,32 +1372,45 @@ msgstr "Ei voitu lisätä aliasta."
msgid "Options saved."
msgstr "Asetukset tallennettu."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Sähköpostiasetukset"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Osoite"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Sähköpostiosoitteet"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Tämän hetken vahvistettu sähköpostiosoite."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Poista"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1370,109 +1419,143 @@ msgstr ""
"sähköpostilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
"lisäohjeita. "
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Peruuta"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Sähköpostiosoitteet"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Lisää"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Saapuva sähköposti"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
"osoitteen"
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Uusi"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Asetukset"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Haluan lähettää päivityksiä sähköpostilla."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Julkaise MicroID sähköpostiosoitteelleni."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Asetukset tallennettu."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Ulkoasuasetukset tallennettu."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Sähköpostiosoitetta ei ole."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Tämä on jo sähköpostiosoitteesi."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Ei voitu asettaa vahvistuskoodia."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1481,43 +1564,56 @@ msgstr ""
"sähköpostilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja "
"miten sitä käytetään. "
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Avoimia vahvistuksia ei ole peruutettavana."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Tämä on väärä pikaviestiosoite."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Vahvistus peruttu."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Tämä ei ole sähköpostiosoitteesi."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Osoite on poistettu."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Saapuvan sähköpostin osoitetta ei ole."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Ei voitu päivittää käyttäjätietoja."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Saapuvan sähköpostin osoite poistettu."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Uusi saapuvan sähköpostin osoite lisätty."
@@ -1711,15 +1807,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Älä estä tätä käyttäjää tästä ryhmästä"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1892,12 +1990,16 @@ msgstr "Käyttäjää ei ole estetty ryhmästä."
msgid "Error removing the block."
msgstr "Tapahtui virhe, kun estoa poistettiin."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Pikaviestiasetukset"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1906,15 +2008,25 @@ msgstr ""
"Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc."
"im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Pikaviestiosoite"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1924,12 +2036,9 @@ msgstr ""
"käyttäjätililtäsi viesti, jossa on lisäohjeet. (Lisäsitkö %s:n "
"ystävälistaasi?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Pikaviestiosoite"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1939,45 +2048,67 @@ msgstr ""
"Varmista että olet lisännyt %s kaverilistaasi pikaviestiohjelmassasi tai "
"GTalkissa."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Asetukset"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
"tilannut. "
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Asetukset tallennettu."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Ei Jabber ID -osoitetta"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Ei voida normalisoida Jabber ID -tunnusta"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Tuo ei ole kelvollinen Jabber ID."
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Tämä on jo Jabber ID -tunnuksesi."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1986,10 +2117,35 @@ msgstr ""
"Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy "
"antaa osoitteelle %s oikeus lähettää viestejä sinulle."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Tämä on väärä pikaviestiosoite."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Ei voitu poistaa sähköpostivahvistusta."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Vahvistus peruttu."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Tämä ei ole Jabber ID-tunnuksesi."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Osoite on poistettu."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2032,7 +2188,9 @@ msgstr "Kutsu uusia käyttäjiä"
msgid "You are already subscribed to these users:"
msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2158,7 +2316,9 @@ msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
msgid "No nickname or ID."
msgstr "Tunnusta ei ole."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s liittyi ryhmään %s"
@@ -2167,11 +2327,13 @@ msgstr "%s liittyi ryhmään %s"
msgid "You must be logged in to leave a group."
msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Sinä et kuulu tähän ryhmään."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s erosi ryhmästä %s"
@@ -2289,12 +2451,12 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
msgid "New message"
msgstr "Uusi viesti"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Ei sisältöä!"
@@ -2302,7 +2464,7 @@ msgstr "Ei sisältöä!"
msgid "No recipient specified."
msgstr "Vastaanottajaa ei ole määritelty."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -2567,7 +2729,7 @@ msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Vahvista"
@@ -3968,47 +4130,77 @@ msgstr ""
msgid "Save site notice"
msgstr "Palvelun ilmoitus"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS-asetukset"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS ei ole käytettävissä."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Pikaviestiosoite"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Tämän hetken vahvistettu SMS puhelinnumero."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Vahvistuskoodi"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Syötä koodi jonka sait puhelimeesi."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS puhelinnumero"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Asetukset"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -4016,23 +4208,34 @@ msgstr ""
"Lähetä päivityksiä SMS:llä; Ymmärrän, että voin saada kohtuuttomia laskuja "
"tästä matkapuhelinoperaattoriltani."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Asetukset tallennettu."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Puhelinnumeroa ei ole."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Operaattoria ei ole valittu."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Tämä on jo puhelinnumerosi."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4040,23 +4243,42 @@ msgstr ""
"Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi "
"vahvistuskoodisi ja ohjeet miten sitä käytetään."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Tämä on väärä vahvistukoodi."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Vahvistus peruttu."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Tämä ei ole puhelinnumerosi."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS puhelinnumero"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Matkapuhelinoperaattori"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Valitse operaattori"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4066,7 +4288,8 @@ msgstr ""
"viestilähetyksiä sähköpostilla, mutta ei ole listattu tänne, lähetä "
"sähköpostia meille osoitteeseen %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Koodia ei ole syötetty."
@@ -5304,10 +5527,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Peruuta"
@@ -5385,34 +5606,40 @@ msgstr "Komento epäonnistui"
msgid "Notice with that id does not exist"
msgstr "Ei profiilia tuolla id:llä."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Käyttäjällä ei ole viimeistä päivitystä"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Tönäisy lähetetty"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5420,203 +5647,207 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Päivitys on merkitty suosikiksi."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Sinä kuulut jo tähän ryhmään."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s liittyi ryhmään %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s erosi ryhmästä %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Koko nimi: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Tietoa: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Suora viesti käyttäjälle %s lähetetty"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Tapahtui virhe suoran viestin lähetyksessä."
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Poista tämä päivitys"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Päivitys lähetetty"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Vastaa tähän päivitykseen"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Käyttäjän %s päivitykset tilattu"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Komentoa ei ole vielä toteutettu."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Ilmoitukset pois päältä."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Ilmoituksia ei voi pistää pois päältä."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Ilmoitukset päällä."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6482,6 +6713,10 @@ msgid "Repeat this notice?"
msgstr "Vastaa tähän päivitykseen"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Kyllä"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Vastaa tähän päivitykseen"
@@ -6680,47 +6915,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 0e0fc639a..1aafddc3a 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:56+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:42+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Fermé"
msgid "Save access settings"
msgstr "Sauvegarder les paramètres d’accès"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Enregistrer"
@@ -108,7 +113,7 @@ msgstr "Page non trouvée."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utilisateur non trouvé."
@@ -352,7 +357,7 @@ msgstr "Aucun statut trouvé avec cet identifiant. "
msgid "This status is already a favorite."
msgstr "Cet avis est déjà un favori."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Impossible de créer le favori."
@@ -470,7 +475,7 @@ msgstr "Groupe non trouvé."
msgid "You are already a member of that group."
msgstr "Vous êtes déjà membre de ce groupe."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
@@ -521,17 +526,17 @@ msgid "Invalid token."
msgstr "Jeton incorrect."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Le jeton de connexion %s a été refusé et révoqué."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Soumission de formulaire inattendue."
@@ -838,27 +846,44 @@ msgstr ""
"abonné à votre compte, ne pourra plus s’y abonner de nouveau, et vous ne "
"serez pas informé des @-réponses de sa part."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Non"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Oui"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -871,8 +896,8 @@ msgstr "Impossible d’enregistrer les informations de blocage."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Aucun groupe trouvé."
@@ -931,16 +956,24 @@ msgstr "Type d’adresse non reconnu : %s."
msgid "That address has already been confirmed."
msgstr "Cette adresse a déjà été confirmée."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Impossible de mettre à jour l’utilisateur."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Impossible de supprimer le courriel de confirmation."
@@ -995,11 +1028,13 @@ msgstr ""
"données à son propos de la base de données, y compris toutes les connexions "
"utilisateur existantes."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Ne pas supprimer cette application"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Supprimer cette application"
@@ -1034,11 +1069,13 @@ msgstr "Supprimer cet avis"
msgid "Are you sure you want to delete this notice?"
msgstr "Voulez-vous vraiment supprimer cet avis ?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -1062,7 +1099,8 @@ msgstr ""
"Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
"données à son propos de la base de données, sans sauvegarde."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Supprimer cet utilisateur"
@@ -1175,15 +1213,13 @@ msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Enregistrer"
@@ -1309,31 +1345,43 @@ msgstr "Impossible de créer les alias."
msgid "Options saved."
msgstr "Vos options ont été enregistrées."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Paramètres du courriel"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adresse électronique"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Adresse courriel actuellement confirmée."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Retirer"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1341,108 +1389,143 @@ msgstr ""
"En attente d’une confirmation pour cette adresse. Vérifiez votre boîte de "
"réception (et celle de spam !) pour recevoir de nouvelles instructions."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annuler"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adresse électronique"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Adresse de courriel (ex : nom@example.org)"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Ajouter"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Courriel entrant"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nouveau"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Préférences"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Avertissez-moi par courriel des nouveaux abonnements."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses "
"favoris."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Je veux envoyer mes avis par courriel."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publier un MicroID pour mon adresse courriel."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Préférences enregistrées"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Préférences de conception enregistrées."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Aucune adresse courriel."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Vous utilisez déjà cette adresse courriel."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Impossible d’insérer le code de confirmation."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1450,43 +1533,56 @@ msgstr ""
"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez "
"votre boîte de réception pour récupérer le code et les instructions."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Aucune confirmation à annuler."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Cette adresse de messagerie instantanée est erronée."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmation annulée."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Ceci n’est pas votre adresse courriel."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "L’adresse a été supprimée."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Aucune adresse de courriel entrant."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "L’adresse de courriel entrant a été supprimée."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nouvelle adresse de courriel entrant ajoutée."
@@ -1677,15 +1773,17 @@ msgstr ""
"seront supprimés du groupe ; il leur sera interdit d’y poster et de s’y "
"abonner à l’avenir."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Bloquer cet utilisateur de de groupe"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
"Erreur de la base de données lors du blocage de l’utilisateur du groupe."
@@ -1871,11 +1969,15 @@ msgstr "Cet utilisateur n’est pas bloqué du groupe."
msgid "Error removing the block."
msgstr "Erreur lors de l’annulation du blocage."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Paramètres de messagerie instantanée"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1885,15 +1987,24 @@ msgstr ""
"(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramètres ci-"
"dessous."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "La messagerie instantanée n’est pas disponible."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adresse de messagerie instantanée"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Adresse Jabber/GTalk actuellement confirmée."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1903,11 +2014,9 @@ msgstr ""
"Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
"votre liste de contacts ?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adresse de messagerie instantanée"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1917,46 +2026,68 @@ msgstr ""
"votre liste d’amis dans votre logiciel de messagerie instantanée ou dans "
"GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Préférences"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Envoyez-moi les avis par Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
"Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Envoyez-moi par Jabber/GTalk les réponses des personnes auxquelles je ne "
"suis pas abonné."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Préférences enregistrées"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Aucun identifiant Jabber"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Impossible d’utiliser cet identifiant Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Identifiant Jabber invalide."
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Vous utilisez déjà cet idenfiant Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1965,10 +2096,35 @@ msgstr ""
"Un code de confirmation a été envoyé à votre adresse de messagerie "
"instantanée. Vous devez approuver %s pour recevoir des messages."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Cette adresse de messagerie instantanée est erronée."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Impossible de supprimer le courriel de confirmation."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation annulée."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Ceci n’est pas votre identifiant Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "L’adresse a été supprimée."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2012,7 +2168,9 @@ msgstr "Inviter de nouveaux utilisateurs"
msgid "You are already subscribed to these users:"
msgstr "Vous êtes déjà abonné à ces utilisateurs :"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2138,7 +2296,9 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
msgid "No nickname or ID."
msgstr "Aucun pseudo ou ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s a rejoint le groupe %2$s"
@@ -2147,11 +2307,13 @@ msgstr "%1$s a rejoint le groupe %2$s"
msgid "You must be logged in to leave a group."
msgstr "Vous devez ouvrir une session pour quitter un groupe."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Vous n’êtes pas membre de ce groupe."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
@@ -2268,12 +2430,12 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
msgid "New message"
msgstr "Nouveau message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Aucun contenu !"
@@ -2281,7 +2443,7 @@ msgstr "Aucun contenu !"
msgid "No recipient specified."
msgstr "Aucun destinataire n’a été spécifié."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2542,7 +2704,7 @@ msgid "6 or more characters"
msgstr "6 caractères ou plus"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmer"
@@ -3948,47 +4110,77 @@ msgstr ""
msgid "Save site notice"
msgstr "Enregistrer l'avis du site"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Paramètres SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Vous pouvez recevoir des messages SMS par courriel en provenance de %%site."
"name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Les SMS ne sont pas disponibles."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adresse de messagerie instantanée"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Numéro de téléphone actuellement confirmé pour recevoir les SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Numéro de téléphone en attente de confirmation."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Code de confirmation"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Entrez le code que vous avez reçu sur votre téléphone."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Numéro de téléphone pour les SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
"Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Préférences"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3996,23 +4188,34 @@ msgstr ""
"Envoyez-moi les avis par SMS ; je comprends que cela pourrait affecter ma "
"facture de téléphonie mobile."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Préférences enregistrées"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Aucun numéro de téléphone."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Aucun fournisseur sélectionné."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Vous utilisez déjà ce numéro de téléphone."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Ce numéro de téléphone est déjà utilisé."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4021,23 +4224,42 @@ msgstr ""
"Vérifiez votre boîte de réception pour récupérer le code et les instructions "
"pour son utilisation."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Ce code de confirmation est incorrect."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation annulée."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Ceci n’est pas votre numéro de téléphone."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numéro de téléphone pour les SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Fournisseur de téléphonie mobile"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Sélectionnez un fournisseur de téléphone mobile"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4047,7 +4269,8 @@ msgstr ""
"qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, "
"écrivez-nous à %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Aucun code entré"
@@ -5255,10 +5478,8 @@ msgstr ""
"Accès par défaut pour cette application : en lecture seule ou en lecture-"
"écriture"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Annuler"
@@ -5334,34 +5555,40 @@ msgstr "Échec de la commande"
msgid "Notice with that id does not exist"
msgstr "Aucun avis avec cet identifiant n’existe"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Aucun avis récent pour cet utilisateur"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Impossible de trouver un utilisateur local portant le pseudo %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Désolé, cette commande n’a pas encore été implémentée."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Clin d’œil envoyé à %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5372,57 +5599,55 @@ msgstr ""
"Abonnés : %2$s\n"
"Messages : %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Avis ajouté aux favoris."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Vous êtes déjà membre de ce groupe"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s a rejoint le groupe %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s a quitté le groupe %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nom complet : %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "À propos : %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5431,144 +5656,150 @@ msgstr ""
"%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux "
"utilisateurs du même serveur."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"Message trop long ! La taille maximale est de %d caractères ; vous en avez "
-"entré %d."
+"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
+"entré %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Message direct envoyé à %s."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Une erreur est survenue pendant l’envoi de votre message."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Impossible de reprendre votre propre avis"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Avis déjà repris"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Avis de %s repris"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Erreur lors de la reprise de l’avis."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
"entré %d."
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Réponse à %s envoyée"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Abonné à %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Désabonné de %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Cette commande n’a pas encore été implémentée."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Avertissements désactivés."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Impossible de désactiver les avertissements."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Avertissements activés."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "La commande d’ouverture de session est désactivée"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
"pendant 2 minutes : %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Désabonné de %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Vous n’êtes abonné(e) à personne."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6546,6 +6777,10 @@ msgid "Repeat this notice?"
msgstr "Reprendre cet avis ?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Oui"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Reprendre cet avis"
@@ -6731,47 +6966,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Modérateur"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 7b64c2712..93e4bb658 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:00+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:45+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr "Bloquear"
msgid "Save access settings"
msgstr "Configuracións de Twitter"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -112,7 +117,7 @@ msgstr "Non existe a etiqueta."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ningún usuario."
@@ -351,7 +356,7 @@ msgstr "Non se atopou un estado con ese ID."
msgid "This status is already a favorite."
msgstr "Este chío xa é un favorito!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non se puido crear o favorito."
@@ -475,7 +480,7 @@ msgstr "Método da API non atopado"
msgid "You are already a member of that group."
msgstr "Xa estas suscrito a estes usuarios:"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -527,17 +532,17 @@ msgid "Invalid token."
msgstr "Tamaño inválido."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -571,12 +576,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envio de formulario non esperada."
@@ -845,29 +853,46 @@ msgstr ""
"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
"ser notificado de ningunha resposta-@ del."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
@@ -880,8 +905,8 @@ msgstr "Erro ao gardar información de bloqueo."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "Non existe a etiqueta."
@@ -943,16 +968,24 @@ msgstr "Tipo de enderezo %s non recoñecido"
msgid "That address has already been confirmed."
msgstr "Esa dirección xa foi confirmada."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Non se puido actualizar o usuario."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non se pode eliminar a confirmación de email."
@@ -1011,12 +1044,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Non se pode eliminar este chíos."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Eliminar chío"
@@ -1053,12 +1088,14 @@ msgstr "Eliminar chío"
msgid "Are you sure you want to delete this notice?"
msgstr "Estas seguro que queres eliminar este chío?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -1084,7 +1121,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Eliminar chío"
@@ -1205,15 +1243,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Gardar"
@@ -1357,32 +1393,45 @@ msgstr "Non se puido crear o favorito."
msgid "Options saved."
msgstr "Configuracións gardadas."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Configuración de Correo"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Xestina como recibir correo dende %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Enderezo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Enderezos de correo"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Direccións de correo confirmadas actualmente."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Eliminar"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1391,108 +1440,142 @@ msgstr ""
"GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches "
"a %s á túa lista de contactos?)"
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Enderezos de correo"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Engadir"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo Entrante"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Enviar un correo a esta dirección para enviar novos chíos."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferencias"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Envíame chios de novas suscricións por email."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Quero enviar chíos dende o mail."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicar unha MicroID dende a miña dirección de correo."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Preferencias gardadas."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Non se inseriu unha dirección de correo"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Xa é o teu enderezo de correo."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Este enderezo de correo xa pertence a outro usuario."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1501,43 +1584,56 @@ msgstr ""
"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
"debes seguir."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Non hai ningunha confirmación pendente para cancelar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Esa é unha enderezo IM incorrecto."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmación cancealada."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Esa non é a túa dirección de correo."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Enderezo eliminado."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Non hai direccións de correo entrante"
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non se puido actualizar o rexistro de usuario."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante eliminada."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Engadida nova dirección de correo entrante."
@@ -1739,15 +1835,17 @@ msgstr ""
"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
"ser notificado de ningunha resposta-@ del."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1927,12 +2025,16 @@ msgstr "O usuario bloqueoute."
msgid "Error removing the block."
msgstr "Acounteceu un erro borrando o bloqueo."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Configuracións de IM"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1941,15 +2043,25 @@ msgstr ""
"Podes enviar e recibir chíos a través de Jabber/GTalk [mensaxes instantáneos]"
"(%%doc.im%%). Configura a túa conta e configuracións abaixo."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Enderezo de IM"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Direccións Jabber/GTalk confirmadas."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1958,12 +2070,9 @@ msgstr ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Enderezo de IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1973,44 +2082,66 @@ msgstr ""
"asegurate de engadir %s á tua lista de contactos no teu cliente de IM ou no "
"GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Enviarme advertencias a través de Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Post a notice when my Jabber/GTalk status changes."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Envíame respostas a través de Jabber/GTalk da xente á que non estou suscrito."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferencias gardadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Sen Identificador de Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Non se pode normalizar ese identificador de Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Non é un Identificador de Jabber válido"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Xa é a túa conta de Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "O identificador de Jabber xa pertence a outro usuario."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -2019,10 +2150,35 @@ msgstr ""
"O código de confirmación foi embiado á dirección IM que engadiches. Deberías "
"engadir a %s como contacto para que che poida enviar mensaxes."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esa é unha enderezo IM incorrecto."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non se pode eliminar a confirmación de email."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmación cancealada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Esa non é a túa conta Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Enderezo eliminado."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2064,7 +2220,9 @@ msgstr "Invitar a novos usuarios"
msgid "You are already subscribed to these users:"
msgstr "Xa estas suscrito a estes usuarios:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2188,7 +2346,9 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
msgid "No nickname or ID."
msgstr "Sen alcume."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s / Favoritos dende %s"
@@ -2198,12 +2358,14 @@ msgstr "%s / Favoritos dende %s"
msgid "You must be logged in to leave a group."
msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "Non estás suscrito a ese perfil"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s / Favoritos dende %s"
@@ -2318,12 +2480,12 @@ msgstr ""
msgid "New message"
msgstr "Nova mensaxe"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Non podes enviar mensaxes a este usurio."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Sen contido!"
@@ -2331,7 +2493,7 @@ msgstr "Sen contido!"
msgid "No recipient specified."
msgstr "Non se especificou ningún destinatario"
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2598,7 +2760,7 @@ msgid "6 or more characters"
msgstr "6 ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -4017,46 +4179,76 @@ msgstr ""
msgid "Save site notice"
msgstr "Novo chío"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "Configuracións de SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Podes recibir mensaxes SMS a través do email dende %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Enderezo de IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Número de teléfono actual confirmado mediante SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Agardando a confirmación neste número de teléfono."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Código de confirmación."
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Insire o código que recibiches no teu teléfono."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "Número de Teléfono do SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -4064,23 +4256,34 @@ msgstr ""
"Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme "
"grandes facturas."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferencias gardadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Non hai ningún número de teléfono."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Non se seleccionou unha operadora."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Xa é o teu número de teléfono."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "O número de teléfono xa pertence a outro usuario."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -4090,24 +4293,43 @@ msgstr ""
"Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
"debes seguir."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Ese é un número de confirmación incorrecto."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmación cancealada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Ese non é o teu número de teléfono."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Número de Teléfono do SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
#, fuzzy
msgid "Mobile carrier"
msgstr "Selecciona unha operadora"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Selecciona unha operadora"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4116,7 +4338,8 @@ msgstr ""
"Operadora móbil do teu teléfono. Se sabes se a operadora acepta SMS sobre "
"email e non está listada aquí, envianos unha mensaxe para incluilo en %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Non se inseriu ningún código"
@@ -5363,10 +5586,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancelar"
@@ -5444,34 +5665,40 @@ msgstr "Comando fallido"
msgid "Notice with that id does not exist"
msgstr "Non se atopou un perfil con ese ID."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "O usuario non ten último chio."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Desculpa, este comando todavía non está implementado."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Toque enviado"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5482,176 +5709,180 @@ msgstr ""
"Suscriptores: %2$s\n"
"Chíos: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Chío marcado coma favorito."
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "Xa estas suscrito a estes usuarios:"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s / Favoritos dende %s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%s / Favoritos dende %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Mensaxe directo a %s enviado"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Erro ó enviar a mensaxe directa."
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Non se pode activar a notificación."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar chío"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Chío publicado"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Non se pode eliminar este chíos."
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica o nome do usuario ó que queres suscribirte"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Comando non implementado."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificación desactivada."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "No se pode desactivar a notificación."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificación habilitada."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -5660,12 +5891,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -5674,12 +5905,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -5688,7 +5919,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:812
+#: lib/command.php:838
#, fuzzy
msgid ""
"Commands:\n"
@@ -6642,6 +6873,10 @@ msgid "Repeat this notice?"
msgstr "Non se pode eliminar este chíos."
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Non se pode eliminar este chíos."
@@ -6847,47 +7082,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 1d1a2ba8b..30bf98576 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:03+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:48+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Pechado"
msgid "Save access settings"
msgstr "Gardar a configuración de acceso"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Gardar"
@@ -104,7 +109,7 @@ msgstr "Non existe tal páxina"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Non existe tal usuario."
@@ -348,7 +353,7 @@ msgstr "Non se atopou ningún estado con esa ID."
msgid "This status is already a favorite."
msgstr "Este estado xa é dos favoritos."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non se puido crear o favorito."
@@ -467,7 +472,7 @@ msgstr "Non se atopou o grupo!"
msgid "You are already a member of that group."
msgstr "Xa forma parte dese grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "O administrador bloqueouno nese grupo."
@@ -518,17 +523,17 @@ msgid "Invalid token."
msgstr "Pase incorrecto."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -563,12 +568,15 @@ msgstr "Autorizouse a ficha da solicitude %s. Intercámbiea por un pase."
msgid "The request token %s has been denied and revoked."
msgstr "Denegouse e revogouse a ficha da solicitude %s."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
@@ -830,27 +838,44 @@ msgstr ""
"subscrito a vostede mentres siga bloqueado, e vostede non recibirá ningunha "
"das súas respostas."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Non"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloquear este usuario"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Non se puido gardar a información do bloqueo."
@@ -863,8 +888,8 @@ msgstr "Non se puido gardar a información do bloqueo."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Non existe tal grupo."
@@ -923,16 +948,24 @@ msgstr "Non se recoñeceu o tipo de enderezo %s"
msgid "That address has already been confirmed."
msgstr "Ese enderezo xa se confirmou."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Non se puido actualizar o usuario."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non se puido borrar a confirmación por correo electrónico."
@@ -987,11 +1020,13 @@ msgstr ""
"datos da aplicación da base de datos, incluídas todas as conexións do "
"usuario existentes."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Non borrar a aplicación"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Borrar a aplicación"
@@ -1026,11 +1061,13 @@ msgstr "Borrar a nota"
msgid "Are you sure you want to delete this notice?"
msgstr "Está seguro de querer borrar esta nota?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Non borrar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Borrar esta nota"
@@ -1054,7 +1091,8 @@ msgstr ""
"Está seguro de querer borrar este usuario? Isto borrará todos os datos do "
"usuario da base de datos, sen posibilidade de recuperalos."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Borrar o usuario"
@@ -1167,15 +1205,13 @@ msgid "Reset back to default"
msgstr "Volver ao deseño por defecto"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Gardar"
@@ -1301,31 +1337,43 @@ msgstr "Non se puideron crear os pseudónimos."
msgid "Options saved."
msgstr "Gardáronse as preferencias."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Configuración do correo electrónico"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Xestiona a forma en que recibes correo electrónico de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Enderezo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Enderezo de correo electrónico"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Enderezo de correo electrónico confirmado actualmente."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Borrar"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1333,113 +1381,148 @@ msgstr ""
"Agardando pola confirmación deste enderezo. Busque unha mensaxe con máis "
"instrucións na súa bandexa de entrada (e na de correo non desexado!)."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Enderezo de correo electrónico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Enderezo de correo electrónico, coma \"nomedeusuario@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Engadir"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo entrante"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Enviar un correo electrónico a este enderezo para publicar novas notas."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Establece un novo enderezo de correo electrónico no que publicar, e cancela "
"o vello."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferencias"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Enviarme notas acerca de novas subscricións por correo electrónico."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviádeme un correo electrónico cando alguén marque como favorito algunha "
"das miñas notas."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviádeme un correo electrónico cando alguén me envíe unha mensaxe privada."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Enviádeme un correo electrónico cando alguén me envíe unha resposta."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Permitirlles aos meus amigos facerme acenos e enviarme correos electrónicos."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Quero publicar notas por correo electrónico."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Gardáronse as preferencias."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Gardáronse as preferencias de deseño."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Non hai enderezo de correo electrónico."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Non se pode normalizar ese enderezo de correo electrónico"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Ese enderezo de correo electrónico é o que ten agora."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1448,43 +1531,56 @@ msgstr ""
"engadiu. Busque o código e as instrucións para usalo na súa bandexa de "
"entrada (e na de correo non desexado!)."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Non hai ningunha confirmación pendente que cancelar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Ese enderezo de mensaxería instantánea é incorrecto."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Cancelouse a confirmación."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Ese non é o seu enderezo de correo electrónico."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Borrouse o enderezo."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Non hai ningún enderezo ao que enviar."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non se puido actualizar o rexistro do usuario."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Borrouse o enderezo de correo electrónico entrante."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
@@ -1674,15 +1770,17 @@ msgstr ""
"do grupo, sen a posibilidade de publicar nada nel nin volver subscribirse a "
"el no futuro."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Non excluír deste grupo a este usuario"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Excluír deste grupo a este usuario"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario."
@@ -1864,11 +1962,15 @@ msgstr "O usuario non está excluído do grupo."
msgid "Error removing the block."
msgstr "Houbo un erro ao facer efectiva a readmisión."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Configuración da mensaxería instantánea"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1877,15 +1979,24 @@ msgstr ""
"Pode enviar e recibir notas mediante [mensaxes instantáneas](%%doc.im%%) de "
"Jabber/GTalk. Configure a continuación o seu enderezo e preferencias."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "A mensaxería instantánea non está dispoñible."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Enderezo de mensaxería instantánea"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1895,11 +2006,9 @@ msgstr ""
"GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de "
"amigos?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Enderezo de mensaxería instantánea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1909,45 +2018,67 @@ msgstr ""
"primeiro de engadir a %s á súa lista de amigos no seu cliente de mensaxería "
"instantánea ou en GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Enviádeme as notas mediante Jabber ou GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Enviádeme as respostas mediante Jabber ou GTalk da xente á que non estou "
"subscrita."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Gardáronse as preferencias."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Non existe ningunha ID de Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Non se pode normalizar esa ID de Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "A ID de Jabber non é correcta"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Esa xa é a súa ID de Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Esa ID de Jabber xa corresponde a un usuario."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1956,10 +2087,35 @@ msgstr ""
"Enviouse un código de confirmación ao enderezo de mensaxería instantánea que "
"engadiu. Ten que aprobar que %s lle envíe mensaxes."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Ese enderezo de mensaxería instantánea é incorrecto."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non se puido borrar a confirmación por correo electrónico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Cancelouse a confirmación."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Esa ID de Jabber non é súa."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Borrouse o enderezo."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2001,7 +2157,9 @@ msgstr "Invitar a novos usuarios"
msgid "You are already subscribed to these users:"
msgstr "Xa está subscrito aos seguintes usuarios:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2124,7 +2282,9 @@ msgstr "Ten que identificarse para unirse a un grupo."
msgid "No nickname or ID."
msgstr "Nin alcume nin ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s uniuse ao grupo %2$s"
@@ -2133,11 +2293,13 @@ msgstr "%1$s uniuse ao grupo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Ten que identificarse para deixar un grupo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Non pertence a ese grupo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -2252,12 +2414,12 @@ msgstr "Utilice o seguinte formulario para crear un novo grupo."
msgid "New message"
msgstr "Mensaxe nova"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Non pode enviarlle unha mensaxe a este usuario."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Non hai contido ningún!"
@@ -2265,7 +2427,7 @@ msgstr "Non hai contido ningún!"
msgid "No recipient specified."
msgstr "Non se especificou ningún destinatario."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -2526,7 +2688,7 @@ msgid "6 or more characters"
msgstr "Seis ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -3844,95 +4006,156 @@ msgstr ""
msgid "Save site notice"
msgstr ""
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr ""
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr ""
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Enderezo de mensaxería instantánea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Gardáronse as preferencias."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Cancelouse a confirmación."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Borrouse o enderezo."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5075,10 +5298,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancelar"
@@ -5152,34 +5373,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr ""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5187,195 +5414,199 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr ""
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr ""
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vostede está subscrito a esta persoa:"
msgstr[1] "Vostede está subscrito a estas persoas:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta persoa está subscrita a vostede:"
msgstr[1] "Estas persoas están subscritas a vostede:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vostede pertence a este grupo:"
msgstr[1] "Vostede pertence a estes grupos:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6197,6 +6428,10 @@ msgid "Repeat this notice?"
msgstr ""
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr ""
@@ -6382,47 +6617,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr ""
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index ab30f9d50..296330eb6 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:06+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:52+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "אין משתמש כזה."
msgid "Save access settings"
msgstr "הגדרות"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -109,7 +114,7 @@ msgstr "אין הודעה כזו."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "אין משתמש כזה."
@@ -345,7 +350,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "זהו כבר זיהוי ה-Jabber שלך."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -467,7 +472,7 @@ msgstr "לא נמצא"
msgid "You are already a member of that group."
msgstr "כבר נכנסת למערכת!"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -520,17 +525,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "הגשת טופס לא צפויה."
@@ -835,29 +843,46 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "לא"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "כן"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -870,8 +895,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "אין הודעה כזו."
@@ -933,16 +958,24 @@ msgstr "סוג לא מזוהה של כתובת %s"
msgid "That address has already been confirmed."
msgstr "כתובת זו כבר אושרה."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "עידכון המשתמש נכשל."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -1000,12 +1033,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "אין הודעה כזו."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
@@ -1039,12 +1074,14 @@ msgstr ""
msgid "Are you sure you want to delete this notice?"
msgstr ""
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "אין הודעה כזו."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr ""
@@ -1069,7 +1106,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "אין משתמש כזה."
@@ -1190,15 +1228,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "שמור"
@@ -1336,180 +1372,240 @@ msgstr "שמירת מידע התמונה נכשל"
msgid "Options saved."
msgstr "ההגדרות נשמרו."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "הגדרות הפרופיל"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "כתבות"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "כתובת מסרים מידיים"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr ""
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "הסר"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "בטל"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "כתובת מסרים מידיים"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "הוסף"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "חדש"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "העדפות"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "העדפות נשמרו."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "הכנסת קוד האישור נכשלה."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "אין אישור ממתין שניתן לבטל."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "זוהי כתובת מסרים מידיים שגויה."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "האישור בוטל."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "הכתובת הוסרה."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1709,17 +1805,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "נכשלה ההפניה לשרת: %s"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "אין משתמש כזה."
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1900,12 +1998,16 @@ msgstr "למשתמש אין פרופיל."
msgid "Error removing the block."
msgstr "שגיאה בשמירת המשתמש."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "הגדרות מסרים מידיים"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1914,16 +2016,26 @@ msgstr ""
"אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
"את כתובתך והעדפותיך למטה."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "כתובת מסרים מידיים"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1932,12 +2044,9 @@ msgstr ""
"מחכה לאישור כתובת זו. בדוק את חשבון ה-Jabber/GTalk שלך לקבלת מסר עם הוראות "
"נוספותץ (האם הוספת את %s לרשימת החברים שלך?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "כתובת מסרים מידיים"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1946,43 +2055,65 @@ msgstr ""
"כתובת Jabber או GTalk, כגון \"UserName@example.org\". הוסף את %s אל רשימת "
"החברים בתוכנת ההמסרים המידיים או GTalk שלך."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "העדפות"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "שלח לי הודעות דרך Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "העדפות נשמרו."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "אין זיהוי Jabber כזה."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "לא עומד בכללים לזיהוי Jabber"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "זהו כבר זיהוי ה-Jabber שלך."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1991,10 +2122,35 @@ msgstr ""
"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
"מידיים אליך."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "זוהי כתובת מסרים מידיים שגויה."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "הכנסת קוד האישור נכשלה."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "האישור בוטל."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "זהו לא זיהוי ה-Jabber שלך."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "הכתובת הוסרה."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2035,7 +2191,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2130,7 +2288,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "אין כינוי"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2139,12 +2299,14 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
@@ -2255,12 +2417,12 @@ msgstr ""
msgid "New message"
msgstr "הודעה חדשה"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "אין תוכן!"
@@ -2268,7 +2430,7 @@ msgstr "אין תוכן!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2530,7 +2692,7 @@ msgid "6 or more characters"
msgstr "לפחות 6 אותיות"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "אשר"
@@ -3881,98 +4043,159 @@ msgstr ""
msgid "Save site notice"
msgstr "הודעה חדשה"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "הגדרות מסרים מידיים"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "כתובת מסרים מידיים"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "אשר"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "העדפות"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "העדפות נשמרו."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr "קוד האישור הזה אינו מיועד לך!"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "האישור בוטל."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "הכתובת הוסרה."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5200,10 +5423,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "בטל"
@@ -5281,35 +5502,41 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr "אין פרופיל תואם לפרופיל המרוחק "
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "למשתמש אין פרופיל."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "עידכון המשתמש נכשל."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "עידכון המשתמש נכשל."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "תגובת עבור %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5317,204 +5544,208 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "הסטטוס של %1$s ב-%2$s "
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "נכשלה יצירת OpenID מתוך: %s"
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "הסטטוס של %1$s ב-%2$s "
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "שם מלא"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "אודות: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "הודעות"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "בעיה בשמירת ההודעה."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "תגובת עבור %s"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "בטל מנוי"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6373,6 +6604,10 @@ msgid "Repeat this notice?"
msgstr "אין הודעה כזו."
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "כן"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "אין הודעה כזו."
@@ -6571,47 +6806,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c7afc53d2..3944af266 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:09+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:55+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "Začinjeny"
msgid "Save access settings"
msgstr "Přistupne nastajenja składować"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Składować"
@@ -105,7 +110,7 @@ msgstr "Strona njeeksistuje"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Wužiwar njeeksistuje"
@@ -334,7 +339,7 @@ msgstr "Status z tym ID njenamakany."
msgid "This status is already a favorite."
msgstr "Tutón status je hižo faworit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -451,7 +456,7 @@ msgstr "Skupina njenamakana!"
msgid "You are already a member of that group."
msgstr "Sy hižo čłon teje skupiny."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -502,17 +507,17 @@ msgid "Invalid token."
msgstr "Njepłaćiwy token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -543,12 +548,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -801,27 +809,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Ně"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Haj"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -834,8 +859,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Skupina njeeksistuje."
@@ -894,16 +919,24 @@ msgstr "Njespóznany adresowy typ %s"
msgid "That address has already been confirmed."
msgstr "Tuta adresa bu hižo wobkrućena."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr ""
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -955,11 +988,13 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Tutu aplikaciju njezničić"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Tutu aplikaciju zničić"
@@ -992,11 +1027,13 @@ msgstr "Zdźělenku wušmórnyć"
msgid "Are you sure you want to delete this notice?"
msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Tutu zdźělenku njewušmórnyć"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
@@ -1018,7 +1055,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Tutoho wužiwarja wušmórnyć"
@@ -1130,15 +1168,13 @@ msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Składować"
@@ -1264,178 +1300,238 @@ msgstr "Aliasy njejsu so dali wutworić."
msgid "Options saved."
msgstr "Opcije składowane."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-mejlowe nastajenja"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresa"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mejlowa adresa"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Aktualna wobkrućena e-mejlowa adresa."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Wotstronić"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Přetorhnyć"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mejlowa adresa"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Přidać"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Dochadźaca e-mejl"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nowy"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Nastajenja"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Chcu zdźělenki přez e-mejl pósłać."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "MicroID za moju e-mejlowu adresu publikować"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Nastajenja składowane."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Designowe nastajenja składowane."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Žana e-mejlowa adresa."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "To je hižo twoja e-mejlowa adresa."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "to je wopačna IM-adresa."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Wobkrućenje přetorhnjene."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "To njeje twoja e-mejlowa adresa."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Adresa bu wotstronjena."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Žana adresa za dochadźace e-mejle."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Adresa za dochadźaće e-mejle wotstronjena."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nowa adresa za dochadźace e-mejle přidata."
@@ -1618,15 +1714,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Tutoho wužiwarja za tutu skupinu blokować"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Tutoho wužiwarja za tutu skupinu blokować"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1796,90 +1894,148 @@ msgstr ""
msgid "Error removing the block."
msgstr ""
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-nastajenja"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM k dispoziciji njesteji."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-adresa"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-adresa"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Nastajenja"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Nastajenja składowane."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Žadyn ID Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr ""
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Njepłaćiwy ID Jabber"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "To je hižo twój ID Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "to je wopačna IM-adresa."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Abonoment njeje so dał zničić."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Wobkrućenje přetorhnjene."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "To njeje twój ID Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adresa bu wotstronjena."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1920,7 +2076,9 @@ msgstr "Nowych wužiwarjow přeprosyć"
msgid "You are already subscribed to these users:"
msgstr "Sy tutych wužiwarjow hižo abonował:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2015,7 +2173,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "Žane přimjeno abo žadyn ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2024,11 +2184,13 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Njejsy čłon teje skupiny."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -2134,12 +2296,12 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
msgid "New message"
msgstr "Nowa powěsć"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Žadyn wobsah!"
@@ -2147,7 +2309,7 @@ msgstr "Žadyn wobsah!"
msgid "No recipient specified."
msgstr "Žadyn přijimowar podaty."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2395,7 +2557,7 @@ msgid "6 or more characters"
msgstr "6 abo wjace znamješkow"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Wobkrućić"
@@ -3691,95 +3853,156 @@ msgstr ""
msgid "Save site notice"
msgstr "Sydłowu zdźělenku składować"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS-nastajenja"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS k dispoziciji njesteji."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-adresa"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Wobkrućić"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS telefonowe čisło"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Nastajenja"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Nastajenja składowane."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Žane telefonowe čisło."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "To je hižo twoje telefonowe čisło."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Te telefonowe čisło hižo druhemu wužiwarjej słuša."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Wobkrućenje přetorhnjene."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS telefonowe čisło"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Žadyn kod zapodaty"
@@ -4920,10 +5143,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -4997,34 +5218,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr "Zdźělenka z tym ID njeeksistuje"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Wužiwar nima poslednju powěsć"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5032,169 +5259,173 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Sy hižo čłon teje skupiny"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Njebě móžno wužiwarja %s skupinje %s přidać"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s je so k skupinje %s přizamknył"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s je skupinu %s wopušćił"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Dospołne mjeno: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Městno: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Wo: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direktna powěsć do %s pósłana"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Njemóžeš swójsku powěsć wospjetować"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Tuta zdźělenka bu hižo wospjetowana"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Zdźělenka wot %s wospjetowana"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Zmylk při wospjetowanju zdźělenki"
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Wotmołwa na %s pósłana"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "OMB-profile njedadźa so přez přikaz abonować."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "%s wotskazany"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sy tutu wosobu abonował:"
@@ -5202,11 +5433,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
msgstr[2] "Sy tute wosoby abonował:"
msgstr[3] "Sy tute wosoby abonował:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Tuta wosoba je će abonowała:"
@@ -5214,11 +5445,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
msgstr[2] "Tute wosoby su će abonowali:"
msgstr[3] "Tute wosoby su će abonowali:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sy čłon tuteje skupiny:"
@@ -5226,7 +5457,7 @@ msgstr[1] "Sy čłon tuteju skupinow:"
msgstr[2] "Sy čłon tutych skupinow:"
msgstr[3] "Sy čłon tutych skupinow:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6048,6 +6279,10 @@ msgid "Repeat this notice?"
msgstr "Tutu zdźělenku wospjetować?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Haj"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Tutu zdźělenku wospjetować"
@@ -6233,47 +6468,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 0d9bf1bce..1137731c7 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:14+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:58+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "Claudite"
msgid "Save access settings"
msgstr "Salveguardar configurationes de accesso"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Salveguardar"
@@ -103,7 +108,7 @@ msgstr "Pagina non existe"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Usator non existe."
@@ -345,7 +350,7 @@ msgstr "Nulle stato trovate con iste ID."
msgid "This status is already a favorite."
msgstr "Iste stato es ja favorite."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Non poteva crear le favorite."
@@ -462,7 +467,7 @@ msgstr "Gruppo non trovate!"
msgid "You are already a member of that group."
msgstr "Tu es ja membro de iste gruppo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Le administrator te ha blocate de iste gruppo."
@@ -513,17 +518,17 @@ msgid "Invalid token."
msgstr "Indicio invalide."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -559,12 +564,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Le indicio de requesta %s ha essite refusate e revocate."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Submission de formulario inexpectate."
@@ -827,27 +835,44 @@ msgstr ""
"cancellate, ille non potera resubscriber se a te in le futuro, e tu non "
"recipera notification de su @-responsas."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non blocar iste usator"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
@@ -860,8 +885,8 @@ msgstr "Falleva de salveguardar le information del blocada."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Gruppo non existe."
@@ -920,16 +945,24 @@ msgstr "Typo de adresse %s non recognoscite"
msgid "That address has already been confirmed."
msgstr "Iste adresse ha ja essite confirmate."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Non poteva actualisar usator."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non poteva deler confirmation de e-mail."
@@ -984,11 +1017,13 @@ msgstr ""
"le application del base de datos, includente tote le existente connexiones "
"de usator."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Non deler iste application"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Deler iste application"
@@ -1023,11 +1058,13 @@ msgstr "Deler nota"
msgid "Are you sure you want to delete this notice?"
msgstr "Es tu secur de voler deler iste nota?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Non deler iste nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -1051,7 +1088,8 @@ msgstr ""
"Es tu secur de voler deler iste usator? Isto radera tote le datos super le "
"usator del base de datos, sin copia de reserva."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Deler iste usator"
@@ -1164,15 +1202,13 @@ msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Salveguardar"
@@ -1298,31 +1334,43 @@ msgstr "Non poteva crear aliases."
msgid "Options saved."
msgstr "Optiones salveguardate."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Configuration de e-mail"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Configurar como reciper e-mail de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adresse de e-mail"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Adresse de e-mail actualmente confirmate."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1330,107 +1378,142 @@ msgstr ""
"Attende confirmation de iste adresse. Verifica tu cassa de entrata (e de "
"spam!) pro un message con ulterior instructiones."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancellar"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adresse de e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Le adresse de e-mail, como \"nomine@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Adder"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "E-mail entrante"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Invia e-mail a iste adresse pro publicar nove notas."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Face un nove adresse de e-mail per le qual publicar; cancella le vetule."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nove"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferentias"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Inviar me e-mail quando alcuno me invia un message private."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitte que amicos me pulsa e me invia e-mail."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Io vole publicar notas per e-mail."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicar un MicroID pro mi adresse de e-mail."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferentias confirmate."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferentias de apparentia salveguardate."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Nulle adresse de e-mail."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Isto es ja tu adresse de e-mail."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Iste adresse de e-mail pertine ja a un altere usator."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non poteva inserer le codice de confirmation."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1439,43 +1522,56 @@ msgstr ""
"addeva. Verifica tu cassa de entrata (e de spam!) pro le codice e le "
"instructiones pro usar lo."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nulle confirmation pendente a cancellar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Iste adresse de messageria instantanee es erronee."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmation cancellate."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Isto non es tu adresse de e-mail."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Le adresse ha essite removite."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nulle adresse de e-mail entrante."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non poteva actualisar le datos del usator."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Adresse de e-mail entrante removite."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nove adresse de e-mail entrante addite."
@@ -1666,15 +1762,17 @@ msgstr ""
"essera removite del gruppo, non potera publicar messages, e non potera "
"subscriber se al gruppo in le futuro."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Non blocar iste usator de iste gruppo"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Blocar iste usator de iste gruppo"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Error del base de datos al blocar le usator del gruppo."
@@ -1857,11 +1955,15 @@ msgstr "Le usator non es blocate del gruppo."
msgid "Error removing the block."
msgstr "Error de remover le blocada."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Configuration de messageria instantanee"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1870,15 +1972,24 @@ msgstr ""
"Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
"Jabber/GTalk. Configura tu adresse e parametros hic infra."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Messageria instantanee non disponibile."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adresse de messageria instantanee"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Adresse Jabber/GTalk actualmente confirmate."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1887,11 +1998,9 @@ msgstr ""
"Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un "
"message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adresse de messageria instantanee"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1901,45 +2010,67 @@ msgstr ""
"de adder %s a tu lista de amicos in tu cliente de messageria instantanee o "
"in GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferentias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Inviar me notas per Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Inviar me responsas per Jabber/GTalk de personas al quales io non es "
"subscribite."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferentias confirmate."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Nulle ID de Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Non pote normalisar iste ID de Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "ID de Jabber non valide"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Isto es ja tu ID de Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Le ID de Jabber pertine ja a un altere usator."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1948,10 +2079,35 @@ msgstr ""
"Un codice de confirmation ha essite inviate al adresse de messageria "
"instantanee specificate. Tu debe approbar que %s invia messages a te."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Iste adresse de messageria instantanee es erronee."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non poteva deler confirmation de e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation cancellate."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Isto non es tu ID de Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Le adresse ha essite removite."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1994,7 +2150,9 @@ msgstr "Invitar nove usatores"
msgid "You are already subscribed to these users:"
msgstr "Tu es a subscribite a iste usatores:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2118,7 +2276,9 @@ msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
msgid "No nickname or ID."
msgstr "Nulle pseudonymo o ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s es ora membro del gruppo %2$s"
@@ -2127,11 +2287,13 @@ msgstr "%1$s es ora membro del gruppo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Tu debe aperir un session pro quitar un gruppo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Tu non es membro de iste gruppo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
@@ -2244,12 +2406,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo."
msgid "New message"
msgstr "Nove message"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Tu non pote inviar un message a iste usator."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Nulle contento!"
@@ -2257,7 +2419,7 @@ msgstr "Nulle contento!"
msgid "No recipient specified."
msgstr "Nulle destinatario specificate."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2519,7 +2681,7 @@ msgid "6 or more characters"
msgstr "6 o plus characteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -3913,44 +4075,74 @@ msgstr ""
msgid "Save site notice"
msgstr "Salveguardar aviso del sito"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Parametros de SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Tu pote reciper messages SMS per e-mail ab %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS non es disponibile."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adresse de messageria instantanee"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Numero de telephono actual e confirmate con servicio SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Iste numero de telephono attende confirmation."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Codice de confirmation"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Entra le codice que tu ha recipite in tu telephono."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Numero de telephono pro SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Numero de telephono, sin punctuation o spatios, con indicativo"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferentias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3958,23 +4150,34 @@ msgstr ""
"Invia me notas per SMS; io comprende que io pote incurrer exorbitante costos "
"de mi operator."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferentias confirmate."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Nulle numero de telephono."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Nulle operator seligite."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Isto es ja tu numero de telephono."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Iste numero de telephono pertine ja a un altere usator."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3982,23 +4185,42 @@ msgstr ""
"Un codice de confirmation ha essite inviate al numero de telephono que tu ha "
"addite. Vide in tu telephono le codice e le instructiones super como usar lo."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Iste codice de confirmation es incorrecte."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation cancellate."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Isto non es tu numero de telephono."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numero de telephono pro SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operator de telephonia mobile"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Selige un operator"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4008,7 +4230,8 @@ msgstr ""
"que accepta SMS via e-mail ma non es listate hic, invia e-mail pro informar "
"nos a %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Nulle codice entrate"
@@ -5208,10 +5431,8 @@ msgstr ""
"Accesso predefinite pro iste application: lectura solmente, o lectura e "
"scriptura"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancellar"
@@ -5287,34 +5508,40 @@ msgstr "Commando fallite"
msgid "Notice with that id does not exist"
msgstr "Non existe un nota con iste ID"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Usator non ha ultime nota"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Non poteva trovar un usator con pseudonymo %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Non poteva trovar un usator local con pseudonymo %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Pardono, iste commando non es ancora implementate."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha multe senso pulsar te mesme!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Pulsata inviate a %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5325,57 +5552,55 @@ msgstr ""
"Subscriptores: %2$s\n"
"Notas: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Nota marcate como favorite."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Tu es ja membro de iste gruppo"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Non poteva facer le usator %s membro del gruppo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s se faceva membro del gruppo %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Non poteva remover le usator %s del gruppo %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s quitava le gruppo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nomine complete: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Loco: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "A proposito: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5384,140 +5609,146 @@ msgstr ""
"%s es un profilo remote; tu pote solmente inviar messages directe a usatores "
"super le mesme servitor."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Message directe a %s inviate"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Error durante le invio del message directe."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Non pote repeter tu proprie nota"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Iste nota ha ja essite repetite"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Nota de %s repetite"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Error durante le repetition del nota."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Responsa a %s inviate"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Errur durante le salveguarda del nota."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica le nomine del usator al qual subscriber te"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribite a %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica le nomine del usator al qual cancellar le subscription"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Subscription a %s cancellate"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Commando non ancora implementate."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notification disactivate."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Non pote disactivar notification."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notification activate."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Non pote activar notification."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Le commando de apertura de session es disactivate"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Iste ligamine pote esser usate solmente un vice, e es valide durante "
"solmente 2 minutas: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Subscription de %s cancellate"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Tu non es subscribite a alcuno."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Tu es subscribite a iste persona:"
msgstr[1] "Tu es subscribite a iste personas:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Necuno es subscribite a te."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Iste persona es subscribite a te:"
msgstr[1] "Iste personas es subscribite a te:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Tu non es membro de alcun gruppo."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Tu es membro de iste gruppo:"
msgstr[1] "Tu es membro de iste gruppos:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6462,6 +6693,10 @@ msgid "Repeat this notice?"
msgstr "Repeter iste nota?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repeter iste nota"
@@ -6647,47 +6882,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "alcun secundas retro"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "circa un minuta retro"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "circa un hora retro"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "circa un die retro"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "circa un mense retro"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 135a7d2b7..49e737db8 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:20+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:02+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr ""
msgid "Save access settings"
msgstr "Stillingar fyrir mynd"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -112,7 +117,7 @@ msgstr "Ekkert þannig merki."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Enginn svoleiðis notandi."
@@ -347,7 +352,7 @@ msgstr "Engin staða fundin með þessu kenni."
msgid "This status is already a favorite."
msgstr "Þetta babl er nú þegar í uppáhaldi!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Gat ekki búið til uppáhald."
@@ -469,7 +474,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
msgid "You are already a member of that group."
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -522,17 +527,17 @@ msgid "Invalid token."
msgstr "Ótæk stærð."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -566,12 +571,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Bjóst ekki við innsendingu eyðublaðs."
@@ -831,28 +839,45 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Já"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
@@ -865,8 +890,8 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Enginn þannig hópur."
@@ -925,16 +950,24 @@ msgstr "Óþekkt gerð tölvupóstfangs %s"
msgid "That address has already been confirmed."
msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Gat ekki uppfært notanda."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
@@ -992,12 +1025,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Gat ekki uppfært hóp."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Eyða þessu babli"
@@ -1031,11 +1066,13 @@ msgstr "Eyða babli"
msgid "Are you sure you want to delete this notice?"
msgstr "Ertu viss um að þú viljir eyða þessu babli?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -1060,7 +1097,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Eyða þessu babli"
@@ -1178,15 +1216,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Vista"
@@ -1324,32 +1360,45 @@ msgstr ""
msgid "Options saved."
msgstr "Valmöguleikar vistaðir."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Tölvupóstsstillingar"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Tölvupóstfang"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Tölvupóstföng"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Núverandi staðfesta tölvupóstfangið."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjarlægja"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1357,107 +1406,141 @@ msgstr ""
"Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og "
"ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Hætta við"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Tölvupóstföng"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Tölvupóstfang eins og \"notandi@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Bæta við"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Móttökutölvupóstur"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nýtt"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Stillingar"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Ég vil babla í gegnum tölvupóst."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Stillingar vistaðar."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Ekkert tölvupóstfang."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Þetta er nú þegar tölvupóstfangið þitt."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Gat ekki sett inn staðfestingarlykil."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1466,43 +1549,56 @@ msgstr ""
"Athugaðu innhólfið þitt (og ruslpóstinn þinn!). Þar ætti "
"staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Engin staðfesting í bið sem þarf að hætta við."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Þetta er rangt snarskilaboðafang."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Hætt við staðfestingu."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Þetta er ekki tölvupóstfangið þitt."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Tölvupóstfangið hefur verið fjarlægt."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ekkert móttökutölvupóstfang."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Gat ekki uppfært skráarfærslu notanda."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Móttökutölvupóstfang fjarlægt."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nýju móttökutölvupóstfangi bætt við."
@@ -1697,15 +1793,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1874,12 +1972,16 @@ msgstr ""
msgid "Error removing the block."
msgstr "Vill kom upp við að aflétta notendalokun."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Snarskilaboðastillingar"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1889,16 +1991,26 @@ msgstr ""
"[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir "
"neðan og stilltu notkunina."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Snarskilaboðafang"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1908,12 +2020,9 @@ msgstr ""
"þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt %"
"s við í vinalistann þinn?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Snarskilaboðafang"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1923,44 +2032,66 @@ msgstr ""
"viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða "
"á GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Stillingar"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Sendur mér babl í gegnum Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Stillingar vistaðar."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Ekkert Jabber-kenni"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Get ekki staðlað þetta Jabber kenni"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Ekki tækt Jabber-kenni"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Þetta er nú þegar Jabber-kennið þitt."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber-kennið tilheyrir öðrum notanda."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1969,10 +2100,35 @@ msgstr ""
"Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta "
"við. Þú verður að leyfa %s að senda snarskilaboð til þín."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Þetta er rangt snarskilaboðafang."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Hætt við staðfestingu."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Þetta er ekki Jabber-kennið þitt."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Tölvupóstfangið hefur verið fjarlægt."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2014,7 +2170,9 @@ msgstr "Bjóða nýjum notendum að vera með"
msgid "You are already subscribed to these users:"
msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2140,7 +2298,9 @@ msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
msgid "No nickname or ID."
msgstr "Ekkert stuttnefni."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s bætti sér í hópinn %s"
@@ -2149,11 +2309,13 @@ msgstr "%s bætti sér í hópinn %s"
msgid "You must be logged in to leave a group."
msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s gekk úr hópnum %s"
@@ -2271,12 +2433,12 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
msgid "New message"
msgstr "Ný skilaboð"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Þú getur ekki sent þessum notanda skilaboð."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Ekkert innihald!"
@@ -2284,7 +2446,7 @@ msgstr "Ekkert innihald!"
msgid "No recipient specified."
msgstr "Enginn móttökuaðili tilgreindur."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2549,7 +2711,7 @@ msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Staðfesta"
@@ -3925,47 +4087,77 @@ msgstr ""
msgid "Save site notice"
msgstr "Babl vefsíðunnar"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS stillingar"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Snarskilaboðafang"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Núverandi staðfesta SMS símanúmerið."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Staðfestingarlykill"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Staðfesta"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS símanúmer"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Stillingar"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3973,45 +4165,75 @@ msgstr ""
"Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að "
"farsímafyrirtækið rukki fyrir móttöku á SMSunum."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Stillingar vistaðar."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Ekkert símanúmer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Ekkert farsímafélag valið."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Þetta er nú þegar símanúmerið þitt."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Þetta er rangur staðfestingarlykill."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Hætt við staðfestingu."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Þetta er ekki símanúmerið þitt."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS símanúmer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Farsímafyrirtæki"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Veldu farsímafyrirtæki"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4021,7 +4243,8 @@ msgstr ""
"gegnum tölvupóst sem er ekki í þessum lista, sendu okkur tölvupóst í %s og "
"láttu okkur vita."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Enginn lykill sleginn inn"
@@ -5253,10 +5476,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Hætta við"
@@ -5333,34 +5554,40 @@ msgstr "Misheppnuð skipun"
msgid "Notice with that id does not exist"
msgstr "Enginn persónuleg síða með þessu einkenni."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Notandi hefur ekkert nýtt babl"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Ýtt við notanda"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5368,203 +5595,207 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Babl gert að uppáhaldi."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Gat ekki bætt notandanum %s í hópinn %s"
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s bætti sér í hópinn %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s gekk úr hópnum %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Fullt nafn: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Heimasíða: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Um: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Bein skilaboð send til %s"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Villa kom upp við að senda bein skilaboð"
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eyða þessu babli"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Babl sent inn"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Vandamál komu upp við að vista babl."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Svara þessu babli"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Nú ert þú áskrifandi að %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Skipun hefur ekki verið fullbúin"
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Tilkynningar af."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Get ekki slökkt á tilkynningum."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Tilkynningar á."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6415,6 +6646,10 @@ msgid "Repeat this notice?"
msgstr "Svara þessu babli"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Já"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Svara þessu babli"
@@ -6608,47 +6843,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 93795b7bd..ba8987299 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:12+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Chiuso"
msgid "Save access settings"
msgstr "Salva impostazioni di accesso"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Salva"
@@ -83,7 +88,6 @@ msgstr "Salva"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "Pagina inesistente."
@@ -106,7 +110,7 @@ msgstr "Pagina inesistente."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utente inesistente."
@@ -236,13 +240,12 @@ msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"È necessario specificare un parametro chiamato \"device\" con un valore tra: "
-"\"sms\", \"im\" o \"none\""
+"\"sms\", \"im\" o \"none\"."
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -349,7 +352,7 @@ msgstr "Nessuno messaggio trovato con quel ID."
msgid "This status is already a favorite."
msgstr "Questo messaggio è già un preferito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Impossibile creare un preferito."
@@ -442,9 +445,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Troppi alias! Massimo %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Alias non valido: \"%s\""
+msgstr "Alias non valido: \"%s\"."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -460,15 +463,14 @@ msgstr "L'alias non può essere lo stesso del soprannome."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Gruppo non trovato!"
+msgstr "Gruppo non trovato."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
msgstr "Fai già parte di quel gruppo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
@@ -519,17 +521,17 @@ msgid "Invalid token."
msgstr "Token non valido."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -563,12 +565,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Il token di richiesta %s è stato rifiutato o revocato."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Invio del modulo inaspettato."
@@ -828,27 +833,44 @@ msgstr ""
"tuoi messaggi, non potrà più abbonarsi e non riceverai notifica delle @-"
"risposte che ti invierà."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Sì"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -861,8 +883,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Nessuna gruppo."
@@ -894,9 +916,9 @@ msgstr "Sblocca questo utente"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Invia a "
+msgstr "Invia a %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -912,25 +934,33 @@ msgstr "Quel codice di conferma non è per te!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Tipo di indirizzo %s non riconosciuto"
+msgstr "Tipo di indirizzo %s non riconosciuto."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
msgid "That address has already been confirmed."
msgstr "Quell'indirizzo è già stato confermato."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Impossibile aggiornare l'utente."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Impossibile eliminare l'email di conferma."
@@ -984,11 +1014,13 @@ msgstr ""
"Vuoi eliminare questa applicazione? Questa azione eliminerà tutti i dati "
"riguardo all'applicazione dal database, comprese tutte le connessioni utente."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Non eliminare l'applicazione"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Elimina l'applicazione"
@@ -1023,11 +1055,13 @@ msgstr "Elimina messaggio"
msgid "Are you sure you want to delete this notice?"
msgstr "Vuoi eliminare questo messaggio?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -1051,7 +1085,8 @@ msgstr ""
"Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati "
"dell'utente dal database, senza una copia di sicurezza."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Elimina questo utente"
@@ -1071,9 +1106,9 @@ msgid "Invalid logo URL."
msgstr "URL del logo non valido."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema non disponibile: %s"
+msgstr "Tema non disponibile: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1164,15 +1199,13 @@ msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Salva"
@@ -1298,31 +1331,43 @@ msgstr "Impossibile creare gli alias."
msgid "Options saved."
msgstr "Opzioni salvate."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Impostazioni email"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Gestisci la ricezione delle email da %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Indirizzo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Indirizzo email"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Indirizzo email attualmente confermato."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Rimuovi"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1331,109 +1376,143 @@ msgstr ""
"posta (e anche la posta indesiderata!) per un messaggio con ulteriori "
"istruzioni."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annulla"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Indirizzo e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Aggiungi"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Email di ricezione"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello "
"vecchio."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nuovo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferenze"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Inviami avvisi di nuovi abbonamenti via email"
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Voglio inviare i messaggi via email"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Pubblica un MicroID per il mio indirizzo email"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferenze salvate."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferenze dell'aspetto salvate."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Nessun indirizzo email."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Quello è già il tuo indirizzo email."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Quell'indirizzo email appartiene già a un altro utente."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Impossibile inserire il codice di conferma."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1521,56 @@ msgstr ""
"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
"codice e le istruzioni su come usarlo."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nessuna conferma da annullare."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Quello è l'indirizzo di messaggistica sbagliato."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Conferma annullata."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Quello non è il tuo indirizzo email."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "L'indirizzo è stato rimosso."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nessun indirizzo email di ricezione."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Impossibile aggiornare il record dell'utente."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Indirizzo email di ricezione rimosso."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nuovo indirizzo email di ricezione aggiunto."
@@ -1598,9 +1690,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Errore nell'aggiornare il profilo remoto"
+msgstr "Errore nell'aggiornare il profilo remoto."
#: actions/getfile.php:79
msgid "No such file."
@@ -1670,15 +1761,17 @@ msgstr ""
"dal gruppo, non potrà più inviare messaggi e non potrà più iscriversi al "
"gruppo."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Non bloccare l'utente da questo gruppo"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Blocca l'utente da questo gruppo"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Errore del database nel bloccare l'utente dal gruppo."
@@ -1861,11 +1954,15 @@ msgstr "L'utente non è bloccato dal gruppo."
msgid "Error removing the block."
msgstr "Errore nel rimuovere il blocco."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Impostazioni messaggistica istantanea"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1875,15 +1972,24 @@ msgstr ""
"istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
"impostazioni qui di seguito."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Messaggistica istantanea non disponibile."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Indirizzo di messaggistica istantanea"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Indirizzo Jabber/GTalk attualmente confermato."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1893,11 +1999,9 @@ msgstr ""
"GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo "
"elenco contatti?"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Indirizzo di messaggistica istantanea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1907,43 +2011,65 @@ msgstr ""
"cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
"di messaggistica o su GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferenze"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Inviami i messaggi via Jabber/GTalk"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferenze salvate."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Nessun ID di Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Impossibile normalizzare quell'ID Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Non è un ID Jabber valido"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Quello è già il tuo ID di Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "ID Jabber già assegnato a un altro utente."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1952,10 +2078,35 @@ msgstr ""
"Un codice di conferma è stato inviato all'indirizzo di messaggistica "
"istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Quello è l'indirizzo di messaggistica sbagliato."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Impossibile eliminare l'email di conferma."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Conferma annullata."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Quello non è il tuo ID di Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "L'indirizzo è stato rimosso."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1977,9 +2128,9 @@ msgid "Invites have been disabled."
msgstr "Gli inviti sono stati disabilitati."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
+msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s."
#: actions/invite.php:72
#, php-format
@@ -1998,7 +2149,9 @@ msgstr "Invita nuovi utenti"
msgid "You are already subscribed to these users:"
msgstr "Hai già un abbonamento a questi utenti:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2121,7 +2274,9 @@ msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
msgid "No nickname or ID."
msgstr "Nessun soprannome o ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s fa ora parte del gruppo %2$s"
@@ -2130,11 +2285,13 @@ msgstr "%1$s fa ora parte del gruppo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Devi eseguire l'accesso per lasciare un gruppo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Non fai parte di quel gruppo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -2209,9 +2366,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Nessun messaggio corrente"
+msgstr "Nessun messaggio corrente."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2245,12 +2401,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo."
msgid "New message"
msgstr "Nuovo messaggio"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Non puoi inviare un messaggio a questo utente."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Nessun contenuto!"
@@ -2258,7 +2414,7 @@ msgstr "Nessun contenuto!"
msgid "No recipient specified."
msgstr "Nessun destinatario specificato."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -2375,9 +2531,9 @@ msgid "You are not a user of that application."
msgstr "Non sei un utente di quella applicazione."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Impossibile revocare l'accesso per l'applicazione: "
+msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2390,9 +2546,8 @@ msgstr ""
"loro applicazioni "
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Il messaggio non ha un profilo"
+msgstr "Il messaggio non ha un profilo."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2401,15 +2556,15 @@ msgstr "Stato di %1$s su %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "tipo di contenuto "
+msgstr "Tipo di contenuto %s non supportato."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Solo URL %s attraverso HTTP semplice."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
@@ -2518,7 +2673,7 @@ msgid "6 or more characters"
msgstr "6 o più caratteri"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Conferma"
@@ -2564,24 +2719,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Percorso e impostazioni server per questo sito StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Directory del tema non leggibile: %s"
+msgstr "Directory del tema non leggibile: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Directory delle immagini degli utenti non scrivibile: %s"
+msgstr "Directory delle immagini degli utenti non scrivibile: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Directory degli sfondi non scrivibile: %s"
+msgstr "Directory degli sfondi non scrivibile: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Directory delle localizzazioni non leggibile: %s"
+msgstr "Directory delle localizzazioni non leggibile: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2721,9 +2876,9 @@ msgid "People search"
msgstr "Cerca persone"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Non è un'etichetta valida di persona: %s"
+msgstr "Non è un'etichetta valida di persona: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2731,9 +2886,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Contenuto del messaggio non valido"
+msgstr "Contenuto del messaggio non valido."
#: actions/postnotice.php:101
#, php-format
@@ -2881,9 +3035,9 @@ msgid "Settings saved."
msgstr "Impostazioni salvate."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Oltre il limite della pagina (%s)"
+msgstr "Oltre il limite della pagina (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3141,7 +3295,6 @@ msgid "Invalid username or password."
msgstr "Nome utente o password non valido."
#: actions/register.php:343
-#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3178,13 +3331,14 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
#: actions/register.php:494
-#, fuzzy, php-format
+#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
-"messaggistica istantanea e numero di telefono."
+"I miei testi e file sono disponibili nei termini di %s a eccezione di questi "
+"dati personali: password, indirizzo email, indirizzo messaggistica "
+"istantanea e numero di telefono."
#: actions/register.php:542
#, php-format
@@ -3801,7 +3955,6 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "Il limite minimo del testo è di 0 caratteri (illimitato)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
msgstr "Il limite per i duplicati deve essere di 1 o più secondi."
@@ -3894,9 +4047,8 @@ msgid "Unable to save site notice."
msgstr "Impossibile salvare il messaggio del sito."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "La dimensione massima del messaggio del sito è di 255 caratteri"
+msgstr "La dimensione massima del messaggio del sito è di 255 caratteri."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -3910,44 +4062,74 @@ msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
msgid "Save site notice"
msgstr "Salva messaggio"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Impostazioni SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Il servizio SMS non è disponibile."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Indirizzo di messaggistica istantanea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Numero di telefono attualmente confermato per gli SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "In attesa della conferma per questo numero di telefono."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Codice di conferma"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Conferma"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Numero di telefono per SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferenze"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3955,23 +4137,34 @@ msgstr ""
"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
"bollette da parte del mio operatore"
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferenze salvate."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Nessun numero di telefono."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Nessun operatore selezionato."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Quello è già il tuo numero di telefono."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Quel numero di telefono appartiene già a un altro utente."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3980,23 +4173,42 @@ msgstr ""
"aggiunto. Controlla il tuo telefono per il codice e le istruzioni su come "
"usarlo."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Quello è il numero di conferma errato."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Conferma annullata."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Quello non è il tuo numero di telefono."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numero di telefono per SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operatore telefonico"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Seleziona un operatore"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4005,7 +4217,8 @@ msgstr ""
"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
"via email, ma non è elencato qui, scrivici a %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Nessun codice inserito"
@@ -4032,7 +4245,6 @@ msgid "Invalid snapshot report URL."
msgstr "URL di segnalazione snapshot non valido."
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "A caso quando avviene un web hit"
@@ -4269,7 +4481,6 @@ msgid "User is not silenced."
msgstr "L'utente non è zittito."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "Nessun ID di profilo nella richiesta."
@@ -4623,9 +4834,9 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "Errore del DB nell'inserire un hashtag: %s"
+msgstr "Errore del database nell'inserire un hashtag: %s"
#: classes/Notice.php:245
msgid "Problem saving notice. Too long."
@@ -4947,13 +5158,13 @@ msgstr "Licenza del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]"
-"(%%site.broughtbyurl%%). "
+"(%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
@@ -5005,6 +5216,8 @@ msgstr ""
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Tutti i contenuti e i dati di %1$s sono disponibili nei termini della "
+"licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1182
@@ -5207,22 +5420,18 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Annulla"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
msgstr "Lettura-scrittura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
msgstr "Sola lettura"
@@ -5230,11 +5439,10 @@ msgstr "Sola lettura"
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Approvata %1$s - Accesso \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revoca"
@@ -5286,34 +5494,40 @@ msgstr "Comando non riuscito"
msgid "Notice with that id does not exist"
msgstr "Un messaggio con quel ID non esiste"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "L'utente non ha un ultimo messaggio."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Impossibile trovare un utente col soprannome %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Impossibile trovare un utente locale col soprannome %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Questo comando non è ancora implementato."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha molto senso se cerchi di richiamarti!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Richiamo inviato a %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5324,57 +5538,55 @@ msgstr ""
"Abbonati: %2$s\n"
"Messaggi: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Messaggio indicato come preferito."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Fai già parte di quel gruppo"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s fa ora parte del gruppo %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s ha lasciato il gruppo %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Informazioni: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5383,140 +5595,146 @@ msgstr ""
"%s è un profilo remoto. È possibile inviare messaggi privati solo agli "
"utenti sullo stesso server."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Messaggio diretto a %s inviato."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Errore nell'inviare il messaggio diretto."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Impossibile ripetere un proprio messaggio"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Hai già ripetuto quel messaggio"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Messaggio da %s ripetuto"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Errore nel ripetere il messaggio."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Risposta a %s inviata"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Errore nel salvare il messaggio."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica il nome dell'utente a cui abbonarti."
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Abbonati a %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Abbonamento a %s annullato"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Comando non ancora implementato."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notifiche disattivate."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Impossibile disattivare le notifiche."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notifiche attivate."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Il comando di accesso è disabilitato"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 "
"minuti: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "%s ha annullato l'abbonamento"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Persona di cui hai già un abbonamento:"
msgstr[1] "Persone di cui hai già un abbonamento:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non fai parte di questo gruppo:"
msgstr[1] "Non fai parte di questi gruppi:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5968,9 +6186,10 @@ msgstr "Conferma SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "In attesa della conferma per questo numero di telefono."
+msgstr ""
+"%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6099,6 +6318,9 @@ msgid ""
"\n"
"\t%s"
msgstr ""
+"L'intera conversazione può essere letta qui:\n"
+"\n"
+"%s"
#: lib/mail.php:651
#, php-format
@@ -6464,6 +6686,10 @@ msgid "Repeat this notice?"
msgstr "Ripetere questo messaggio?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sì"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Ripeti questo messaggio"
@@ -6649,47 +6875,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderatore"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 91d52c69e..91c845921 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:33+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:15+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "閉じられた"
msgid "Save access settings"
msgstr "アクセス設定の保存"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -107,7 +112,7 @@ msgstr "そのようなページはありません。"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "そのようなユーザはいません。"
@@ -347,7 +352,7 @@ msgstr "そのIDのステータスが見つかりません。"
msgid "This status is already a favorite."
msgstr "このステータスはすでにお気に入りです。"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "お気に入りを作成できません。"
@@ -467,7 +472,7 @@ msgstr "グループが見つかりません!"
msgid "You are already a member of that group."
msgstr "すでにこのグループのメンバーです。"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "管理者によってこのグループからブロックされています。"
@@ -518,17 +523,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "予期せぬフォーム送信です。"
@@ -823,27 +831,44 @@ msgstr ""
"たからフォローを外されるでしょう、将来、あなたにフォローできないで、あなたは"
"どんな @-返信 についてもそれらから通知されないでしょう。"
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "No"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "このユーザをアンブロックする"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "このユーザをブロックする"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "ブロック情報の保存に失敗しました。"
@@ -856,8 +881,8 @@ msgstr "ブロック情報の保存に失敗しました。"
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "そのようなグループはありません。"
@@ -916,16 +941,24 @@ msgstr "不明なアドレスタイプ %s"
msgid "That address has already been confirmed."
msgstr "そのアドレスは既に承認されています。"
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "ユーザを更新できません"
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "メール承認を削除できません"
@@ -980,11 +1013,13 @@ msgstr ""
"あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
"ベースからユーザに関するすべてのデータをクリアします。"
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "このアプリケーションを削除しないでください"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "このアプリケーションを削除"
@@ -1019,11 +1054,13 @@ msgstr "つぶやき削除"
msgid "Are you sure you want to delete this notice?"
msgstr "本当にこのつぶやきを削除しますか?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "このつぶやきを削除できません。"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "このつぶやきを削除"
@@ -1047,7 +1084,8 @@ msgstr ""
"あなたは本当にこのユーザを削除したいですか? これはバックアップなしでデータ"
"ベースからユーザに関するすべてのデータをクリアします。"
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "このユーザを削除"
@@ -1160,15 +1198,13 @@ msgid "Reset back to default"
msgstr "デフォルトへリセットする"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
@@ -1294,31 +1330,43 @@ msgstr "別名を作成できません。"
msgid "Options saved."
msgstr "オプションが保存されました。"
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "メール設定"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "%%site.name%% からのメールを管理。"
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "住所"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "メールアドレス"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "現在確認されているメールアドレス。"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "削除"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1326,109 +1374,144 @@ msgstr ""
"このアドレスは承認待ちです。受信ボックス(とスパムボックス)に追加の指示が書"
"かれたメッセージが届いていないか確認してください。"
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "中止"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "メールアドレス"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "メールアドレス、\"UserName@example.org\" のような"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "追加"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "入ってくるメール"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "新しいつぶやき投稿にこのアドレスへメールする"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "New"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "設定"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "メールで新規フォローの通知を私に送ってください。"
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
"い。"
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "友達が私に合図とメールを送ることを許可する。"
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "メールでつぶやきを投稿したい。"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "私のメールアドレスのためにMicroIDを発行してください。"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "設定が保存されました。"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "デザイン設定が保存されました。"
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "メールアドレスがありません。"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効なメールアドレスではありません。"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "これはすでにあなたのメールアドレスです。"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "このメールアドレスは既に他の人が使っています。"
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "承認コードを追加できません"
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1437,43 +1520,56 @@ msgstr ""
"ムボックス)にコードとそれをどう使うのかという指示が届いていないか確認してく"
"ださい。"
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "承認待ちのものはありません。"
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "その IM アドレスは不正です。"
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "承認作業が中止されました。"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "これはあなたのメールアドレスではありません。"
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "アドレスは削除されました。"
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "入ってくるメールアドレスではありません。"
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "ユーザレコードを更新できません。"
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "入ってくるメールアドレスは削除されました。"
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "新しい入ってくるメールアドレスが追加されました。"
@@ -1668,15 +1764,17 @@ msgstr ""
"本当にユーザ %1$s をグループ %2$s からブロックしますか? 彼らはグループから削"
"除される、投稿できない、グループをフォローできなくなります。"
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "このグループからこのユーザをブロックしない"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "このグループからこのユーザをブロック"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "グループからのブロックユーザのデータベースエラー"
@@ -1859,11 +1957,15 @@ msgstr "ユーザはグループからブロックされていません。"
msgid "Error removing the block."
msgstr "ブロックの削除エラー"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM設定"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1872,15 +1974,24 @@ msgstr ""
"Jabber/GTalk [instant messages](%%doc.im%%) 経由で通知の送信、受信が可能で"
"す。下のアドレスを設定して下さい。"
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM が利用不可。"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IMアドレス"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "確認された最新の Jabber/GTakk アドレス"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1889,11 +2000,9 @@ msgstr ""
"このアドレスは承認待ちです。Jabber か Gtalk のアカウントで追加の指示が書かれ"
"たメッセージを確認してください。(%s を友人リストに追加しましたか?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IMアドレス"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1902,45 +2011,67 @@ msgstr ""
"\"UserName@example.org\" といった Jabber または GTalk のアドレス。まず、%s を"
"IMクライアントやGTalkに追加して下さい。"
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "設定"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Jabber/GTalk で私に通知を送って下さい。"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
"い。"
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "設定が保存されました。"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Jabbar ID はありません。"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "その Jabbar ID を正規化できません"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "有効な Jabber ID ではありません。"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "その Jabber ID は既にあなたのものです。"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID jは既に別のユーザが使用しています。"
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1949,10 +2080,35 @@ msgstr ""
"承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる"
"ようにするには%sを承認してください。"
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "その IM アドレスは不正です。"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "メール承認を削除できません"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "承認作業が中止されました。"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "その Jabber ID はあなたのものではありません。"
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "アドレスは削除されました。"
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1994,7 +2150,9 @@ msgstr "新しいユーザを招待"
msgid "You are already subscribed to these users:"
msgstr "すでにこれらのユーザをフォローしています:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2120,7 +2278,9 @@ msgstr "グループに入るためにはログインしなければなりませ
msgid "No nickname or ID."
msgstr "ニックネームがありません。"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s はグループ %2$s に参加しました"
@@ -2129,11 +2289,13 @@ msgstr "%1$s はグループ %2$s に参加しました"
msgid "You must be logged in to leave a group."
msgstr "グループから離れるにはログインしていなければなりません。"
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "あなたはそのグループのメンバーではありません。"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s はグループ %2$s に残りました。"
@@ -2243,12 +2405,12 @@ msgstr "このフォームを使って新しいグループを作成します。
msgid "New message"
msgstr "新しいメッセージ"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "このユーザにメッセージを送ることはできません。"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "コンテンツがありません!"
@@ -2256,7 +2418,7 @@ msgstr "コンテンツがありません!"
msgid "No recipient specified."
msgstr "受取人が書かれていません。"
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2516,7 +2678,7 @@ msgid "6 or more characters"
msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "パスワード確認"
@@ -3916,45 +4078,75 @@ msgstr ""
msgid "Save site notice"
msgstr "サイトつぶやき"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS 設定"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"あなたは %%site.name%% からメールでSMSメッセージを受け取ることができます。"
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS は利用できません。"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IMアドレス"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "現在の確認された SMS 可能な電話番号。"
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "この電話番号は確認待ちです。"
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "確認コード"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "パスワード確認"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS 電話番号"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "電話番号、句読点またはスペースがない、市街番号付き"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "設定"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3962,23 +4154,34 @@ msgstr ""
"SMSを通してつぶやきを私に送ってください; 私は、私のキャリアから法外な料金を被"
"るかもしれないのを理解しています。"
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "設定が保存されました。"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "電話番号がありません。"
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "キャリアが選択されていません。"
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "これはすでにあなたの電話番号です。"
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "この電話番号はすでに他のユーザに使われています。"
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3986,23 +4189,42 @@ msgstr ""
"あなたが加えた電話番号に確認コードを送りました。 どうそれを使用するかに関する"
"コードと指示のために電話をチェックしてください。"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "それは間違った確認番号です。"
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "承認作業が中止されました。"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "それはあなたの電話番号ではありません。"
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS 電話番号"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "携帯電話会社"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "キャリア選択"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4012,7 +4234,8 @@ msgstr ""
"載されていないキャリアを知っているなら、メールを送って、%sで私たちに知らせて"
"ください。"
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "コードが入力されていません"
@@ -5228,10 +5451,8 @@ msgstr ""
"このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
"ライト"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "中止"
@@ -5307,34 +5528,40 @@ msgstr "コマンド失敗"
msgid "Notice with that id does not exist"
msgstr "その ID によるつぶやきは存在していません"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "ユーザはまだつぶやいていません"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "ユーザを更新できません"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "ユーザを更新できません"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "すみません、このコマンドはまだ実装されていません。"
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "それは自分自身への合図で多くは意味がありません!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "%s へ合図を送りました"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5345,193 +5572,197 @@ msgstr ""
"フォローされている: %2$s\n"
"つぶやき: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "お気に入りにされているつぶやき。"
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "あなたは既にそのグループに参加しています。"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ユーザ %s はグループ %s に参加できません"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s はグループ %s に参加しました"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "ユーザ %s をグループ %s から削除することができません"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s はグループ %s に残りました。"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "フルネーム: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "場所: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "ホームページ: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "About: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "ダイレクトメッセージを %s に送りました"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "ダイレクトメッセージ送信エラー。"
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "自分のつぶやきを繰り返すことはできません"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "すでにこのつぶやきは繰り返されています"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "%s からつぶやきが繰り返されています"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "つぶやき繰り返しエラー"
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "%s へ返信を送りました"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "つぶやき保存エラー。"
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "フォローするユーザの名前を指定してください"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "あなたはそのプロファイルにフォローされていません。"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "%s をフォローしました"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "フォローをやめるユーザの名前を指定してください"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s のフォローをやめる"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "コマンドはまだ実装されていません。"
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "通知オフ。"
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "通知をオフできません。"
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "通知オン。"
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "通知をオンできません。"
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "ログインコマンドが無効になっています。"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "%s のフォローをやめる"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "あなたはだれにもフォローされていません。"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "あなたはこの人にフォローされています:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "誰もフォローしていません。"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "この人はあなたにフォローされている:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "あなたはどのグループのメンバーでもありません。"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "あなたはこのグループのメンバーではありません:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6445,6 +6676,10 @@ msgid "Repeat this notice?"
msgstr "このつぶやきを繰り返しますか?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Yes"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "このつぶやきを繰り返す"
@@ -6634,47 +6869,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "管理"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index fe03c831a..7df910a59 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:38+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:18+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "폐쇄"
msgid "Save access settings"
msgstr "접근 설정을 저장"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "저장"
@@ -103,7 +108,7 @@ msgstr "해당하는 페이지 없음"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "해당하는 이용자 없음"
@@ -336,7 +341,7 @@ msgstr "그 ID로 발견된 상태가 없습니다."
msgid "This status is already a favorite."
msgstr "이 소식은 이미 관심소식으로 등록되어 있습니다."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "관심소식을 생성할 수 없습니다."
@@ -455,7 +460,7 @@ msgstr "그룹을 찾을 수 없습니다."
msgid "You are already a member of that group."
msgstr "당신은 이미 이 그룹의 멤버입니다."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -507,17 +512,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -549,12 +554,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "잘못된 폼 제출"
@@ -813,27 +821,44 @@ msgstr ""
"정말 이용자를 차단하시겠습니까? 차단된 이용자는 구독해제되고, 이후 당신을 구"
"독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "아니오"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "이용자를 차단하지 않는다."
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "네, 맞습니다."
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "이 사용자 차단하기"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
@@ -846,8 +871,8 @@ msgstr "정보차단을 저장하는데 실패했습니다."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "그러한 그룹이 없습니다."
@@ -907,16 +932,24 @@ msgstr "인식되지않은 주소유형 %s"
msgid "That address has already been confirmed."
msgstr "그 주소는 이미 승인되었습니다."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "사용자를 업데이트 할 수 없습니다."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "이메일 승인을 삭제 할 수 없습니다."
@@ -973,12 +1006,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "이 통지를 지울 수 없습니다."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "이 게시글 삭제하기"
@@ -1014,12 +1049,14 @@ msgstr "통지 삭제"
msgid "Are you sure you want to delete this notice?"
msgstr "정말로 통지를 삭제하시겠습니까?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "이 통지를 지울 수 없습니다."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "이 게시글 삭제하기"
@@ -1043,7 +1080,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "이 게시글 삭제하기"
@@ -1159,15 +1197,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "저장"
@@ -1302,31 +1338,43 @@ msgstr "좋아하는 게시글을 생성할 수 없습니다."
msgid "Options saved."
msgstr "옵션들이 저장되었습니다."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "이메일 설정"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "주소"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "이메일 주소"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "확인된 최신의 이메일 계정"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "삭제"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1334,107 +1382,142 @@ msgstr ""
"이 주소는 인증 대기중입니다. 수신함(또는 스팸함)을 확인하셔서 지침을 확인해 "
"주시기 바랍니다."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "취소"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "이메일 주소"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "\"UserName@example.org\" 와 같은 이메일 계정"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "추가"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "받은 이메일"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오/"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "포스팅을 위한 새 이메일 계정의 생성; 전 이메일 계정은 취소."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "새로운"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "설정"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "새로운 예약 구독의 통지를 이메일로 보내주세요."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "누군가 내 글을 좋아하는 게시글로 추가했을때, 이메일을 보냅니다."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "친구들이 내게 이메일이나 쪽지를 보낼 수 있도록 허용합니다."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "이메일로 통보를 포스트 하길 원합니다."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "이메일 주소를 위한 MicroID의 생성"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "설정이 저장되었습니다."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "싱크설정이 저장되었습니다."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "이메일이 추가 되지 않았습니다."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "그 이메일 주소를 정규화 할 수 없습니다."
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "유효한 이메일 주소가 아닙니다."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "그 이메일 주소는 이미 귀하의 것입니다."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "확인 코드를 추가 할 수 없습니다."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1525,56 @@ msgstr ""
"추가한 이메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드"
"와 사용법을 확인하여 주시기 바랍니다."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "취소 할 대기중인 인증이 없습니다."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "옳지 않은 메신저 계정 입니다."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "인증 취소"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "그 이메일 주소는 귀하의 것이 아닙니다."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "주소가 삭제되었습니다."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "이메일 주소가 없습니다."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "사용자 기록을 업데이트 할 수 없습니다."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "받은 이메일 계정 삭제"
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "새로운 이메일 주소가 추가 되었습니다."
@@ -1676,17 +1772,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "이 그룹의 회원리스트"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "이 그룹의 회원리스트"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1864,12 +1962,16 @@ msgstr "회원이 당신을 차단해왔습니다."
msgid "Error removing the block."
msgstr "차단 제거 에러!"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "메신저 설정"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1878,15 +1980,25 @@ msgstr ""
"당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아"
"래 당신의 주소와 환경설정을 조정하세요."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "인스턴트 메신저를 사용할 수 없습니다."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "메신저 주소"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "확인된 최신의 Jabber/GTalk 계정"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1895,12 +2007,9 @@ msgstr ""
"이 주소는 인증 대기 중입니다. Jabber/Gtalk로 메시지를 확인해 주십시오.(%s 항"
"목을 추가하셨습니까?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "메신저 주소"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1909,44 +2018,66 @@ msgstr ""
"\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 "
"GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "설정"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Jabber/GTalk 로 통지를 보내주세요."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"내가 구독하지 않는 사람으로 부터의 답장을 Jabber/GTalk을 통해 보내주세요."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "설정이 저장되었습니다."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Jabber ID가 아닙니다."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "유효한 Jabber ID가 아닙니다."
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "그 Jabber ID는 이미 귀하의 것입니다."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1955,10 +2086,35 @@ msgstr ""
"추가한 메신저 주소로 인증 코드를 보냈습니다. %s 사용자를 허락해야 메시지를 전"
"달할 수 있습니다."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "옳지 않은 메신저 계정 입니다."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "이메일 승인을 삭제 할 수 없습니다."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "인증 취소"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "주소가 삭제되었습니다."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1999,7 +2155,9 @@ msgstr "새 사용자를 초대"
msgid "You are already subscribed to these users:"
msgstr "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2117,7 +2275,9 @@ msgstr "그룹가입을 위해서는 로그인이 필요합니다."
msgid "No nickname or ID."
msgstr "별명이 없습니다."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s 는 그룹 %s에 가입했습니다."
@@ -2126,11 +2286,13 @@ msgstr "%s 는 그룹 %s에 가입했습니다."
msgid "You must be logged in to leave a group."
msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s가 그룹%s를 떠났습니다."
@@ -2244,12 +2406,12 @@ msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
msgid "New message"
msgstr "새로운 메시지입니다."
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "내용이 없습니다!"
@@ -2257,7 +2419,7 @@ msgstr "내용이 없습니다!"
msgid "No recipient specified."
msgstr "수신자를 지정하지 않았습니다."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2520,7 +2682,7 @@ msgid "6 or more characters"
msgstr "6글자 이상"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "인증"
@@ -3900,48 +4062,78 @@ msgstr ""
msgid "Save site notice"
msgstr "사이트 공지"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS 세팅"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"당신은 %%site.name%% 로부터 이메일을 통해 SMS메시지를 받을 수 있습니다."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "메신저 주소"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "이 전화 번호는 인증 대기중입니다."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "인증 코드"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "인증"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS 휴대폰 번호"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "설정"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3949,23 +4141,34 @@ msgstr ""
"통지를 SMS로 보내주세요; 물론 통신사로부터 바가지 요금을 문다는 것은 알고 있"
"습니다."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "설정이 저장되었습니다."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "휴대폰 번호가 없습니다."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "통신회사가 선택 되지 않았습니다."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "그 휴대폰 번호는 이미 귀하의 것입니다."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "그 휴대폰 번호는 이미 다른 사용자의 것입니다."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3974,30 +4177,50 @@ msgstr ""
"추가한 휴대폰으로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코"
"드와 사용법을 확인하여 주시기 바랍니다."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "옳지 않은 인증 번호 입니다."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "인증 취소"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS 휴대폰 번호"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "휴대전화 사업자"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "통신 회사를 선택 하세요."
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "코드가 입력 되지 않았습니다."
@@ -5227,10 +5450,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "취소"
@@ -5308,34 +5529,40 @@ msgstr "실행 실패"
msgid "Notice with that id does not exist"
msgstr "해당 id의 프로필이 없습니다."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "이용자의 지속적인 게시글이 없습니다."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "찔러 보기를 보냈습니다."
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5343,200 +5570,204 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "게시글이 좋아하는 글로 지정되었습니다."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "당신은 이미 이 그룹의 멤버입니다."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "그룹 %s에 %s는 가입할 수 없습니다."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s 는 그룹 %s에 가입했습니다."
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s가 그룹%s를 떠났습니다."
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "전체이름: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "위치: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "홈페이지: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "자기소개: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "%s에게 보낸 직접 메시지"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "직접 메시지 보내기 오류."
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "이 게시글 삭제하기"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "게시글이 등록되었습니다."
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "이 게시글에 대해 답장하기"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "구독하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "%s에게 구독되었습니다."
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s에서 구독을 해제했습니다."
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "명령이 아직 실행되지 않았습니다."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "알림끄기."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "알림을 끌 수 없습니다."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "알림이 켜졌습니다."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "%s에서 구독을 해제했습니다."
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6388,6 +6619,10 @@ msgid "Repeat this notice?"
msgstr "이 게시글에 대해 답장하기"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "네, 맞습니다."
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "이 게시글에 대해 답장하기"
@@ -6586,47 +6821,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 016d96c0e..0a920ba8b 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:46+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:21+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Затворен"
msgid "Save access settings"
msgstr "Зачувај нагодувања на пристап"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Зачувај"
@@ -105,7 +110,7 @@ msgstr "Нема таква страница."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Нема таков корисник."
@@ -348,7 +353,7 @@ msgstr "Нема пронајдено статус со таков ID."
msgid "This status is already a favorite."
msgstr "Овој статус веќе Ви е омилен."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Не можам да создадам омилина забелешка."
@@ -466,7 +471,7 @@ msgstr "Групата не е пронајдена."
msgid "You are already a member of that group."
msgstr "Веќе членувате во таа група."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Блокирани сте од таа група од администраторот."
@@ -517,17 +522,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr "Жетонот на барањето %s е одобрен. Замене
msgid "The request token %s has been denied and revoked."
msgstr "Жетонот на барањето %s е одбиен и поништен."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Неочекувано поднесување на образец."
@@ -828,27 +836,44 @@ msgstr ""
"претплати на Вас во иднина, и нема да бидете известени ако имате @-одговори "
"од корисникот."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Не"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не го блокирај корисников"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокирај го корисников"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Не можев да ги снимам инофрмациите за блокот."
@@ -861,8 +886,8 @@ msgstr "Не можев да ги снимам инофрмациите за б
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Нема таква група."
@@ -921,16 +946,24 @@ msgstr "Непознат тип на адреса %s."
msgid "That address has already been confirmed."
msgstr "Оваа адреса веќе е потврдена."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Не можев да го подновам корисникот."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не можев да ја избришам потврдата по е-пошта."
@@ -985,11 +1018,13 @@ msgstr ""
"избрише сите податоци за програмот од базата, вклучувајќи ги сите постоечки "
"поврзувања."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Не го бриши овој програм"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Избриши го програмов"
@@ -1024,11 +1059,13 @@ msgstr "Бриши забелешка"
msgid "Are you sure you want to delete this notice?"
msgstr "Дали сте сигурни дека сакате да ја избришете оваа заблешка?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Не ја бриши оваа забелешка"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Бриши ја оваа забелешка"
@@ -1052,7 +1089,8 @@ msgstr ""
"Дали се сигурни дека сакате да го избришете овој корисник? Ова воедно ќе ги "
"избрише сите податоци за корисникот од базата, без да може да се вратат."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Избриши овој корисник"
@@ -1165,15 +1203,13 @@ msgid "Reset back to default"
msgstr "Врати по основно"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Зачувај"
@@ -1299,31 +1335,43 @@ msgstr "Не можеше да се создадат алијаси."
msgid "Options saved."
msgstr "Нагодувањата се зачувани."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Нагодувања за е-пошта"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Раководење со начинот на кој добивате е-пошта од %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Адреса"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Е-поштенска адреса"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Тековна потврдена е-поштенска адреса."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Отстрани"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1331,109 +1379,144 @@ msgstr ""
"Очекувам потврда за оваа адреса. Проверете си го приемното сандаче (а и "
"сандачето за спам!). Во писмото ќе следат понатамошни напатствија."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Откажи"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Е-поштенска адреса"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Е-пошта, од обликот „UserName@example.org“"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Додај"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Приемна пошта"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Испраќајте е-пошта на оваа адреса за да објавувате нови забелешки."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Ново"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Нагодувања"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Испраќај ми известувања за нови претплати по е-пошта."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Испраќај ми е-пошта кога некој ќе додаде моја забелешка како омилена."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“"
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-"
"пошта."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Сакам да објавувам забелешки по е-пошта."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Објави MicroID за мојата е-поштенска адреса."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Нагодувањата се зачувани."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Нема е-поштенска адреса."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилна адреса за е-пошта."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Оваа е-поштенска адреса е веќе Ваша."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Кодот за потврда не може да се внесе."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1525,56 @@ msgstr ""
"сандачето за добиени писма (а и сандачето за спам!) за да го видите кодот и "
"напатствијата за негово користење."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Нема потврди кои може да се откажат."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Ова е погрешната IM адреса."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Потврдата е откажана"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Ова не е Вашата е-поштенска адреса."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Адресата е отстранета."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Нема приемна е-поштенска адреса."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не можев да ја подновам корисничката евиденција."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Приемната е-поштенска адреса е отстранета."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Додадена е нова влезна е-поштенска адреса."
@@ -1669,15 +1765,17 @@ msgstr ""
"$s“? Корисникот ќе биде отстранет од групата, и во иднина нема да може да "
"објавува во таа група и да се претплаќа на неа."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Не го блокирај овој корисник од оваа група"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Блокирај го овој корисник од оваа група"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
"Се појави грешка во базата наподатоци при блокирањето на корисникот од "
@@ -1863,11 +1961,15 @@ msgstr "Корисникот не е блокиран од групата."
msgid "Error removing the block."
msgstr "Грешка при отстранување на блокот."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Нагодувања за IM"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1876,15 +1978,24 @@ msgstr ""
"Можете да примате и праќате забелешки преку Jabber/GTalk [брзи пораки](%%doc."
"im%%). Подолу "
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM е недостапно."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM адреса"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Моментално потврдена Jabber/GTalk адреса."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1894,11 +2005,9 @@ msgstr ""
"порака со понатамошни инструкции. (Дали го додадовте %s на Вашата листа со "
"пријатели?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM адреса"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1907,44 +2016,66 @@ msgstr ""
"Jabber или GTalk адреса како „ime@example.org“. Но прво додајте го %s во "
"Вашата контакт листа во Вашиот IM клиент или GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Нагодувања"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Испраќај ми забелешки преку Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Објавувај забелешка кога мојот статус на Jabber/GTalk ќе се промени."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Испраќај ми одговори преку Jabber/GTalk од луѓе на кои не сум претплатен."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Објави MicroID за мојата адреса на Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Нагодувањата се зачувани."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Нема JabberID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Ова JabberID не може да се нормализира."
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Неправилен JabberID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Ова веќе е Вашиот Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Ова Jabber ID му припаѓа на друг корисник."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1953,10 +2084,35 @@ msgstr ""
"Испративме код за потврда на IM адресата што ја додадовте. Мора да го "
"одобрите %S за да ви испраќа пораки."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Ова е погрешната IM адреса."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Не можев да ја избришам потврдата по е-пошта."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Потврдата е откажана"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Ова не е Вашиот Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Адресата е отстранета."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2000,7 +2156,9 @@ msgstr "Покани нови корисници"
msgid "You are already subscribed to these users:"
msgstr "Веќе сте претплатени на овие корисници:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2124,7 +2282,9 @@ msgstr "Мора да сте најавени за да можете да се
msgid "No nickname or ID."
msgstr "Нема прекар или ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s се зачлени во групата %2$s"
@@ -2133,11 +2293,13 @@ msgstr "%1$s се зачлени во групата %2$s"
msgid "You must be logged in to leave a group."
msgstr "Мора да сте најавени за да можете да ја напуштите групата."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Не членувате во таа група."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
@@ -2248,12 +2410,12 @@ msgstr "Овој образец служи за создавање нова гр
msgid "New message"
msgstr "Нова порака"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Не можете да испратите порака до овојо корисник."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Нема содржина!"
@@ -2261,7 +2423,7 @@ msgstr "Нема содржина!"
msgid "No recipient specified."
msgstr "Нема назначено примач."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2522,7 +2684,7 @@ msgid "6 or more characters"
msgstr "6 или повеќе знаци"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Потврди"
@@ -3923,45 +4085,75 @@ msgstr ""
msgid "Save site notice"
msgstr "Зачувај ја објавава"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Нагодувања за СМС"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Можете да примате СМС пораки по е-пошта од %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "СМС-пораките се недостапни."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM адреса"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Тековен потврден телефонски број со можност за СМС."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Очекувам потврда за овој телефонски број."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Потврден код"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Внесете го кодот што го добивте по телефон."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Потврди"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Телефонски број за СМС"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
"Телефонски број, без интерпункциски знаци и празни места, со повикувачки код"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Нагодувања"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3969,23 +4161,34 @@ msgstr ""
"Испраќај ми забелешки по СМС; разбрам дека ова може да доведе до прекумерни "
"трошоци."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Нагодувањата се зачувани."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Нема телефонски број."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Немате избрано оператор."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Ова и сега е Вашиот телефонски број."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Тој телефонски број е веќе во употреба од друг корисник."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3993,23 +4196,42 @@ msgstr ""
"На телефонскиот број што го додадовте е испратен потврден код. Проверете си "
"го телефонот за да го видите кодот, заедно со напатствија за негова употреба."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Ова е погрешен потврден број."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Потврдата е откажана"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Тоа не е Вашиот телефонски број."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Телефонски број за СМС"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Мобилен оператор"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Изберете оператор"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4018,7 +4240,8 @@ msgstr ""
"Мобилен оператор за телефонот. Ако знаете оператор што прифаќа СМС преку е-"
"пошта, но не фигурира овде, известете нè на %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Нема внесено код"
@@ -5220,10 +5443,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Основно-зададен пристап за овој програм: само читање, или читање-пишување"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Откажи"
@@ -5299,34 +5520,40 @@ msgstr "Наредбата не успеа"
msgid "Notice with that id does not exist"
msgstr "Не постои забелешка со таков id"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Корисникот нема последна забелешка"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не можев да пронајдам корисник со прекар %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Не можев да пронајдам локален корисник со прекар %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Жалиме, оваа наредба сè уште не е имплементирана."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Нема баш логика да се подбуцнувате сами себеси."
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Испратено подбуцнување на %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5337,57 +5564,55 @@ msgstr ""
"Претплатници: %2$s\n"
"Забелешки: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Забелешката е обележана како омилена."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Веќе членувате во таа група"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Не можев да го зачленам корисникот %s во групата %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s се зачлени во групата %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Не можев да го отстранам корисникот %s од групата %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ја напушти групата %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Име и презиме: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Локација: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "За: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5396,141 +5621,147 @@ msgstr ""
"%s е далечински профил; можете да праќате директни пораки само до корисници "
"на истиот сервер."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"Пораката е предолга - дозволени се највеќе %d знаци, а вие испративте %d"
+"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Директната порака до %s е испратена"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Грашка при испаќањето на директната порака."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Не можете да повторувате сопствени забалешки"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Оваа забелешка е веќе повторена"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Забелешката од %s е повторена"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Грешка при повторувањето на белешката."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие испративте %"
"d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Одговорот на %s е испратен"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Грешка при зачувувањето на белешката."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Назначете го името на корисникот на којшто сакате да се претплатите"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Не можете да се претплаќате на OMB профили по наредба."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Претплатено на %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Назначете го името на корисникот од кого откажувате претплата."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Претплатата на %s е откажана"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Наредбата сè уште не е имплементирана."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Известувањето е исклучено."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Не можам да исклучам известување."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Известувањето е вклучено."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Не можам да вклучам известување."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Наредбата за најава е оневозможена"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Откажана претплата на %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Не сте претплатени никому."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Никој не е претплатен на Вас."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Не членувате во ниедна група."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6504,6 +6735,10 @@ msgid "Repeat this notice?"
msgstr "Да ја повторам белешкава?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Да"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Повтори ја забелешкава"
@@ -6689,47 +6924,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеца"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 149c103e4..8d8876028 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:52+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:25+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Lukket"
msgid "Save access settings"
msgstr "Lagre tilgangsinnstillinger"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Lagre"
@@ -104,7 +109,7 @@ msgstr "Ingen slik side"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ingen slik bruker"
@@ -347,7 +352,7 @@ msgstr "Fant ingen status med den ID-en."
msgid "This status is already a favorite."
msgstr "Denne statusen er allerede en favoritt."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunne ikke opprette favoritt."
@@ -464,7 +469,7 @@ msgstr "Gruppe ikke funnet!"
msgid "You are already a member of that group."
msgstr "Du er allerede medlem av den gruppen."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Du har blitt blokkert fra den gruppen av administratoren."
@@ -515,17 +520,17 @@ msgid "Invalid token."
msgstr "Ugyldig symbol."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -556,12 +561,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Uventet skjemainnsending."
@@ -819,27 +827,44 @@ msgstr ""
"lenger abbonere på deg, vil ikke kunne abbonere på deg i fremtiden og du vil "
"ikke bli varslet om @-svar fra dem."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ikke blokker denne brukeren"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokker denne brukeren"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
@@ -852,8 +877,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Ingen slik gruppe."
@@ -912,16 +937,24 @@ msgstr "Ukjent adressetype %s"
msgid "That address has already been confirmed."
msgstr "Den adressen har allerede blitt bekreftet."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Klarte ikke å oppdatere bruker."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kunne ikke slette e-postbekreftelse."
@@ -976,11 +1009,13 @@ msgstr ""
"data om programmet fra databasen, inkludert alle eksisterende "
"brukertilkoblinger."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Ikke slett dette programmet"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Slett dette programmet"
@@ -1015,11 +1050,13 @@ msgstr "Slett notis"
msgid "Are you sure you want to delete this notice?"
msgstr "Er du sikker på at du vil slette denne notisen?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Ikke slett denne notisen"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1043,7 +1080,8 @@ msgstr ""
"Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
"om brukeren fra databasen, uten sikkerhetskopi."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Slett denne brukeren"
@@ -1155,15 +1193,13 @@ msgid "Reset back to default"
msgstr "Tilbakestill til standardverdier"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lagre"
@@ -1289,31 +1325,43 @@ msgstr "Kunne ikke opprette alias."
msgid "Options saved."
msgstr "Lagret valg."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-postinnstillinger"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Velg hvordan du mottar e-post fra %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-postadresse"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Nåværende bekreftede e-postadresse"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1321,106 +1369,141 @@ msgstr ""
"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppelboksen) for "
"melding med videre veiledning."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-postadresse"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-postadresse («brukernavn@eksempel.org»)"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Legg til"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "innkommende e-post"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send e-post til denne adressen for å poste nye notiser."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Innstillinger"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Send meg varsler om nye abonnementer gjennom e-post."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send meg en e-post når noen legger min notis til som favoritt."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Send meg en e-post når noen sender meg en privat melding."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send meg en e-post når noen sender meg et «@-svar»."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillat venner å knuffe meg og sende meg en e-post."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Jeg vil poste notiser med e-post."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publiser en MicroID for min e-postadresse."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Innstillinger lagret."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Ingen e-postadresse."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Det er allerede din e-postadresse."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Den e-postadressen tilhører allerede en annen bruker."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunne ikke sette inn bekreftelseskode."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1428,43 +1511,56 @@ msgstr ""
"En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
"din (og søppelboksen) for koden, og hvordan du skal bruke den."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen ventende bekreftelse å avbryte."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Det er feil IM-adresse."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Bekreftelse avbrutt."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Det er ikke din e-postadresse."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Adressen ble fjernet."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen innkommende e-postadresse."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkommende e-postadresse fjernet."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny innkommende e-postadresse lagt til."
@@ -1653,15 +1749,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Ikke blokker denne brukeren fra denne gruppa"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Blokker denne brukeren fra denne gruppen"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1839,26 +1937,39 @@ msgstr "Bruker er ikke blokkert fra gruppe."
msgid "Error removing the block."
msgstr "Feil under oppheving av blokkering."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Innstillinger for direktemeldinger"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr ""
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Direktemeldingsadresse"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Nåværende bekreftede Jabber/GTak-adresse."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1867,54 +1978,74 @@ msgstr ""
"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
"instruksjoner (la du %s til vennelisten din?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Direktemeldingsadresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Innstillinger"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Innstillinger lagret."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Ingen Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Klarer ikke normalisere Jabber-IDen"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Ugyldig Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Det er allerede din Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1923,10 +2054,35 @@ msgstr ""
"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
"godkjenne %s for å sende meldinger til deg."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Det er feil IM-adresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kunne ikke slette e-postbekreftelse."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bekreftelse avbrutt."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Det er ikke din Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adressen ble fjernet."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1968,7 +2124,9 @@ msgstr "Inviter nye brukere"
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2082,7 +2240,9 @@ msgstr "Du må være innlogget for å bli med i en gruppe."
msgid "No nickname or ID."
msgstr "ngen kallenavn eller ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s ble med i gruppen %2$s"
@@ -2091,11 +2251,13 @@ msgstr "%1$s ble med i gruppen %2$s"
msgid "You must be logged in to leave a group."
msgstr "Du må være innlogget for å forlate en gruppe."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Du er ikke et medlem av den gruppen."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
@@ -2206,12 +2368,12 @@ msgstr "Bruk dette skjemaet for å opprette en ny gruppe."
msgid "New message"
msgstr "Ny melding"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Du kan ikke sende en melding til denne brukeren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Inget innhold."
@@ -2219,7 +2381,7 @@ msgstr "Inget innhold."
msgid "No recipient specified."
msgstr "Ingen mottaker oppgitt."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2472,7 +2634,7 @@ msgid "6 or more characters"
msgstr "6 eller flere tegn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Bekreft"
@@ -3832,66 +3994,107 @@ msgstr ""
msgid "Save site notice"
msgstr "Innstillinger for IM"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS-innstillinger"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS er ikke tilgjengelig."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Direktemeldingsadresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Venter på bekreftelse for dette telefonnummeret."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Bekreftelseskode"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Skriv inn koden du mottok på telefonen din."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Telefonnummer for SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Innstillinger"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Innstillinger lagret."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Ingen telefonnummer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Ingen operatør valgt."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Det er allerede din ditt telefonnummer."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3900,30 +4103,50 @@ msgstr ""
"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
"din for koden, og hvordan du skal bruke den."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bekreftelse avbrutt."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Det er ikke ditt telefonnummer."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefonnummer for SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Mobiloperatør"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Velg en operatør"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5086,10 +5309,8 @@ msgstr ""
"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
"skrivetilgang"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Avbryt"
@@ -5165,34 +5386,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr "Notis med den id'en finnes ikke"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Bruker har ingen siste notis"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Fant ingen bruker med kallenavn %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Fant ingen bruker med kallenavn %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Det gir ikke så mye mening å knuffe seg selv."
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Knuff sendt til %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5203,198 +5430,202 @@ msgstr ""
"Abonnenter: %2$s\n"
"Notiser: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Notis markert som favoritt."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Du er allerede medlem av den gruppen."
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ble med i gruppen %s"
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Kunne ikke fjerne brukeren %s fra gruppen %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s forlot gruppen %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Fullt navn: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Posisjon: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Hjemmeside: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Om: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Melding for lang - maks er %d tegn, du sendte %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direktemelding til %s sendt"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Feil ved sending av direktemelding."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Kan ikke repetere din egen notis"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Allerede repetert den notisen"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Notis fra %s repetert"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Feil ved repetering av notis."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Notis for lang - maks er %d tegn, du sendte %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Svar til %s sendt"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Feil ved lagring av notis."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Svar til %s"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6297,6 +6528,10 @@ msgid "Repeat this notice?"
msgstr "Repeter denne notisen?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repeter denne notisen"
@@ -6487,47 +6722,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index f1842a874..b88ce26d6 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:01+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:31+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "Gesloten"
msgid "Save access settings"
msgstr "Toegangsinstellingen opslaan"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Opslaan"
@@ -104,7 +109,7 @@ msgstr "Deze pagina bestaat niet."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Onbekende gebruiker."
@@ -348,7 +353,7 @@ msgstr "Er is geen status gevonden met dit ID."
msgid "This status is already a favorite."
msgstr "Deze mededeling staat al in uw favorietenlijst."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Het was niet mogelijk een favoriet aan te maken."
@@ -470,7 +475,7 @@ msgstr "De groep is niet aangetroffen."
msgid "You are already a member of that group."
msgstr "U bent al lid van die groep."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
@@ -521,17 +526,17 @@ msgid "Invalid token."
msgstr "Ongeldig token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -570,12 +575,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Het formulier is onverwacht ingezonden."
@@ -837,27 +845,44 @@ msgstr ""
"niet meer volgen en u wordt niet op de hoogte gebracht van \"@\"-antwoorden "
"van deze gebruiker."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nee"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Gebruiker niet blokkeren"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
@@ -870,8 +895,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "De opgegeven groep bestaat niet."
@@ -930,16 +955,24 @@ msgstr "Onbekend adrestype %s."
msgid "That address has already been confirmed."
msgstr "Dit adres is al bevestigd."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "De e-mailbevestiging kon niet verwijderd worden."
@@ -994,11 +1027,13 @@ msgstr ""
"worden alle gegevens van deze applicatie uit de database verwijderd, "
"inclusief alle bestaande gebruikersverbindingen."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Deze applicatie niet verwijderen"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Deze applicatie verwijderen"
@@ -1033,11 +1068,13 @@ msgstr "Mededeling verwijderen"
msgid "Are you sure you want to delete this notice?"
msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -1062,7 +1099,8 @@ msgstr ""
"worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
"niet mogelijk ze terug te zetten."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Gebruiker verwijderen"
@@ -1175,15 +1213,13 @@ msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Opslaan"
@@ -1309,31 +1345,43 @@ msgstr "Het was niet mogelijk de aliassen aan te maken."
msgid "Options saved."
msgstr "De instellingen zijn opgeslagen."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-mailvoorkeuren"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mailadres"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Huidige bevestigde e-mailadres"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Verwijderen"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1341,108 +1389,142 @@ msgstr ""
"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox (en uw "
"ongewenste berichten/spam) voor een bericht met nadere instructies."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annuleren"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mailadres"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Toevoegen"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkomende e-mail"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
"bestaande e-mailadres wordt verwijderd."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nieuw"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Voorkeuren"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Mij e-mailen bij nieuwe abonnementen."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Mij e-mailen als iemand mij een privébericht zendt."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Vrienden mogen me porren en e-mailen."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Ik wil mededelingen per e-mail plaatsen."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Een MicroID voor mijn e-mailadres publiceren."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Uw voorkeuren zijn opgeslagen."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "De ontwerpvoorkeuren zijn opgeslagen."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Geen e-mailadres"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "De bevestigingscode kon niet ingevoegd worden."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1451,43 +1533,56 @@ msgstr ""
"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
"hoe het te gebruiken."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Dat is het verkeerde IM-adres."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Bevestiging geannuleerd."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Dit is niet uw e-mailadres."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Het adres is verwijderd."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Geen binnenkomend e-mailadres"
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kan de gebruikersgegevens niet vernieuwen"
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Het e-mailadres voor inkomende mail is verwijderd."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
@@ -1683,15 +1778,17 @@ msgstr ""
"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer "
"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
"Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de "
@@ -1878,11 +1975,15 @@ msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
msgid "Error removing the block."
msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-instellingen"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1891,15 +1992,24 @@ msgstr ""
"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
"berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM is niet beschikbaar."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-adres"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Huidige bevestigde Jabber/GTalk adres."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1909,11 +2019,9 @@ msgstr ""
"gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
"contactenlijst toegevoegd?"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-adres"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1922,45 +2030,67 @@ msgstr ""
"Jabber-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
"%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Voorkeuren"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Mij berichten sturen via Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
"geabonneerd ben."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Uw voorkeuren zijn opgeslagen."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Geen Jabber-ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Geen geldige Jabber-ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "U hebt dit al ingesteld als uw Jabber-ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1969,10 +2099,35 @@ msgstr ""
"Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
"ermee akkoord gaan dat %s berichten aan u verzendt."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Dat is het verkeerde IM-adres."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "De e-mailbevestiging kon niet verwijderd worden."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bevestiging geannuleerd."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Dit is niet uw Jabber-ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Het adres is verwijderd."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2015,7 +2170,9 @@ msgstr "Nieuwe gebruikers uitnodigen"
msgid "You are already subscribed to these users:"
msgstr "U bent als geabonneerd op deze gebruikers:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2141,7 +2298,9 @@ msgstr "U moet aangemeld zijn om lid te worden van een groep."
msgid "No nickname or ID."
msgstr "Geen gebruikersnaam of ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s is lid geworden van de groep %2$s"
@@ -2150,11 +2309,13 @@ msgstr "%1$s is lid geworden van de groep %2$s"
msgid "You must be logged in to leave a group."
msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "U bent geen lid van deze groep"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
@@ -2265,12 +2426,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
msgid "New message"
msgstr "Nieuw bericht"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "U kunt geen bericht naar deze gebruiker zenden."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Geen inhoud!"
@@ -2278,7 +2439,7 @@ msgstr "Geen inhoud!"
msgid "No recipient specified."
msgstr "Er is geen ontvanger aangegeven."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -2541,7 +2702,7 @@ msgid "6 or more characters"
msgstr "Zes of meer tekens"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Bevestigen"
@@ -3951,44 +4112,74 @@ msgstr ""
msgid "Save site notice"
msgstr "Websitebrede mededeling opslaan"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS-instellingen"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS is niet beschikbaar."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-adres"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Bevestigingscode"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "SMS-nummer"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Voorkeuren"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3996,23 +4187,34 @@ msgstr ""
"Mij mededelingen via SMS sturen. Ik begrijp dat dit exorbitante rekeningen "
"van mijn provider kan opleveren."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Uw voorkeuren zijn opgeslagen."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Geen telefoonnummer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Er is geen provider geselecteerd."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "U hebt dit al ingesteld als uw telefoonnummer."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Dit telefoonnummer is al geregistrerd door een andere gebruiker."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4020,23 +4222,42 @@ msgstr ""
"Er is een bevestigingscode verzonden naar het telefoonnummer dat u hebt "
"toegevoegd. Op uw telefoon vindt u de code en de instructies."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Dit is het verkeerde bevestigingsnummer."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bevestiging geannuleerd."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Dit is niet uw telefoonnummer."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-nummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Mobiele aanbieder"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Selecteer een provider"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4046,7 +4267,8 @@ msgstr ""
"SMS ondersteunt, maar nog niet in de lijst is opgenomen, laat dit ons dan "
"via e-mail weten op het e-mailadres %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Er is geen code ingevoerd"
@@ -4073,7 +4295,6 @@ msgid "Invalid snapshot report URL."
msgstr "De rapportage-URL voor snapshots is ongeldig."
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Willekeurig tijdens een websitehit"
@@ -4668,7 +4889,7 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
@@ -5262,34 +5483,29 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Annuleren"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Lezen en schrijven"
+msgstr "lezen en schrijven"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Alleen-lezen"
+msgstr "alleen-lezen"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Goedgekeurd op %1$s met toegang \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Intrekken"
@@ -5341,34 +5557,40 @@ msgstr "Het uitvoeren van het commando is mislukt"
msgid "Notice with that id does not exist"
msgstr "Er bestaat geen mededeling met dat ID"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Deze gebruiker heeft geen laatste mededeling"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "De gebruiker %s is niet aangetroffen"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "De lokale gebruiker %s is niet aangetroffen"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Het heeft niet zoveel zin om uzelf te porren..."
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "De por naar %s is verzonden"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5379,57 +5601,55 @@ msgstr ""
"Abonnees: %2$s\n"
"Mededelingen: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "De mededeling is op de favorietenlijst geplaatst."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "U bent al lid van deze groep"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s is lid geworden van de groep %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s heeft de groep %s verlaten"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Volledige naam: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Over: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5438,145 +5658,151 @@ msgstr ""
"%s is een profiel op afstand. U kunt alle privéberichten verzenden aan "
"gebruikers op dezelfde server."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw "
-"bericht was %d"
+"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
+"bericht was %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Het directe bericht aan %s is verzonden"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "U kunt uw eigen mededelingen niet herhalen."
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "U hebt die mededeling al herhaald."
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "De mededeling van %s is herhaald"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
"bevatte %d tekens"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Het antwoord aan %s is verzonden"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Geabonneerd op %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Uw abonnement op %s is opgezegd"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificaties uitgeschakeld."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificaties ingeschakeld."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Het aanmeldcommando is uitgeschakeld"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
"geldig: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Het abonnement van %s is opgeheven"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6556,6 +6782,10 @@ msgid "Repeat this notice?"
msgstr "Deze mededeling herhalen?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Deze mededeling herhalen"
@@ -6741,47 +6971,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index bf802b96f..00534aea6 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:57+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:28+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Blokkér"
msgid "Save access settings"
msgstr "Avatar-innstillingar"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -111,7 +116,7 @@ msgstr "Dette emneord finst ikkje."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Brukaren finst ikkje."
@@ -348,7 +353,7 @@ msgstr "Fann ingen status med den ID-en."
msgid "This status is already a favorite."
msgstr "Denne notisen er alt ein favoritt!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunne ikkje lagre favoritt."
@@ -471,7 +476,7 @@ msgstr "Fann ikkje API-metode."
msgid "You are already a member of that group."
msgstr "Du er allereie medlem av den gruppa"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -524,17 +529,17 @@ msgid "Invalid token."
msgstr "Ugyldig storleik."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -568,12 +573,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Uventa skjemasending."
@@ -835,28 +843,45 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Lås opp brukaren"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Jau"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
@@ -869,8 +894,8 @@ msgstr "Lagring av informasjon feila."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Denne gruppa finst ikkje."
@@ -931,16 +956,24 @@ msgstr "Ukjend adressetype %s"
msgid "That address has already been confirmed."
msgstr "Den addressa har alt blitt bekrefta."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Kan ikkje oppdatera brukar."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kan ikkje sletta e-postgodkjenning."
@@ -998,12 +1031,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Kan ikkje sletta notisen."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Slett denne notisen"
@@ -1040,12 +1075,14 @@ msgstr "Slett notis"
msgid "Are you sure you want to delete this notice?"
msgstr "Sikker på at du vil sletta notisen?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1070,7 +1107,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Slett denne notisen"
@@ -1192,15 +1230,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lagra"
@@ -1339,32 +1375,45 @@ msgstr "Kunne ikkje lagre favoritt."
msgid "Options saved."
msgstr "Lagra innstillingar."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Epostinnstillingar"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Styr korleis du får epost frå %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Epostadresser"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Godkjent epostadresse."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1372,109 +1421,143 @@ msgstr ""
"Ventar på godkjenning. Sjekk innboksen (og søppelpostboksen) for ei melding "
"med instruksjonar."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Epostadresser"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Epostadresse («brukarnamn@example.org»)"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Legg til"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Innkomande epost"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send epost til denne addressa for å legge til nye notisar."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Brukarval"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Send meg ein notis ved nye tingingar på epost."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Send meg ein epost når nokon sender meg ei privat melding."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send meg ein epost når nokon sender meg ei privat melding."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillat vennar å sende meg ein epost."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Eg vil senda notisar med epost."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publiser ein MicroID for epost addressa mi."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Lagra brukarval."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Synkroniserings innstillingar blei lagra."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Ingen epostadresse."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Det er alt din epost addresse"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Den epost addressa er alt registrert hos ein annan brukar."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kan ikkje leggja til godkjenningskode."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1482,43 +1565,56 @@ msgstr ""
"Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
"søppelpostboksen) for koden og veiledning på korleis du nyttar han."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen ventande stadfesting å avbryta."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Det er feil lynmeldings addresse."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Stadfesting avbrutt."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Det er ikkje din epost addresse."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Addressa blei fjerna."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen innkomande epostadresse."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kan ikkje oppdatera brukarinformajon."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Fjerna innkomande epostadresse."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "La til ny innkomande epostadresse."
@@ -1718,17 +1814,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1908,12 +2006,16 @@ msgstr "Brukar har blokkert deg."
msgid "Error removing the block."
msgstr "Feil ved fjerning av blokka."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Ljonmeldinginnstillingar"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1922,16 +2024,26 @@ msgstr ""
"Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
"doc.im%%). Set opp adressa og innstillingar under."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Ljonmeldingadresse"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Stadfesta Jabber/Gtalk-adresse."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1940,12 +2052,9 @@ msgstr ""
"Venter på godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
"instruksjonar (la du %s til venelista di?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Ljonmeldingadresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1954,43 +2063,65 @@ msgstr ""
"Jabber- eller GTalk-adresse, døme «brukarnamn@example.org». Hugs å fyrst "
"leggja %s til venelista di i ljonmeldingsklienten din."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Brukarval"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Send meg ein notis via Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar på."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Lagra brukarval."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Nei Jabber-ID"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Klarar ikkje normalisera Jabber-IDen"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Ikkje ein gyldig Jabber-ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Det er alt din Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1999,10 +2130,35 @@ msgstr ""
"Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s "
"for å senda meldinger til deg."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Det er feil lynmeldings addresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kan ikkje sletta e-postgodkjenning."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Stadfesting avbrutt."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Det er ikkje din Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Addressa blei fjerna."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2043,7 +2199,9 @@ msgstr "Invitér nye brukarar"
msgid "You are already subscribed to these users:"
msgstr "Du tingar allereie oppdatering frå desse brukarane:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2164,7 +2322,9 @@ msgstr "Du må være logga inn for å bli med i ei gruppe."
msgid "No nickname or ID."
msgstr "Ingen kallenamn."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s blei medlem av gruppe %s"
@@ -2173,11 +2333,13 @@ msgstr "%s blei medlem av gruppe %s"
msgid "You must be logged in to leave a group."
msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Du er ikkje medlem av den gruppa."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s forlot %s gruppa"
@@ -2293,12 +2455,12 @@ msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
msgid "New message"
msgstr "Ny melding"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Du kan ikkje sende melding til denne brukaren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Ingen innhald."
@@ -2306,7 +2468,7 @@ msgstr "Ingen innhald."
msgid "No recipient specified."
msgstr "Ingen mottakar spesifisert."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2571,7 +2733,7 @@ msgid "6 or more characters"
msgstr "6 eller fleire teikn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Godta"
@@ -3959,47 +4121,77 @@ msgstr ""
msgid "Save site notice"
msgstr "Statusmelding"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS innstillingar"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Ljonmeldingadresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Godkjent mobiltelefonnummer."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Ventar på godkjenning for dette telefonnummeret."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Stadfestingskode"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Skriv inn koden du fekk på telefonen."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Godta"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS telefon nummer"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Telefonnummer, kun tall, med landskode"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Brukarval"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -4007,23 +4199,34 @@ msgstr ""
"Send meg ein notis via SMS; eg forstår at dette kan føre til kostnadar fra "
"min tilbydar."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Lagra brukarval."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Ingen telefonnummer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Ingen mobiloperatør vald."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Det er alt ditt telefonnummer"
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -4032,23 +4235,42 @@ msgstr ""
"Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
"koden og veiledning på korleis du nyttar han."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Det er feil godkjennings nummer."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Stadfesting avbrutt."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Det er ikkje ditt telefonnummer"
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS telefon nummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Telefontilbydar"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Velg ein tilbydar"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4057,7 +4279,8 @@ msgstr ""
"Mobiloperatøren din. Ta kontakt på %s viss du kjenner ein mobiloperatør som "
"aksepterer SMS-over-epost, men ikkje vistast her."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Ingen innskriven kode"
@@ -5294,10 +5517,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Avbryt"
@@ -5375,34 +5596,40 @@ msgstr "Kommandoen feila"
msgid "Notice with that id does not exist"
msgstr "Fann ingen profil med den IDen."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Brukaren har ikkje siste notis"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Orsak, men kommandoen er ikkje laga enno."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Dytta!"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5410,203 +5637,207 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Notis markert som favoritt."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Du er allereie medlem av den gruppa"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s blei medlem av gruppe %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s forlot %s gruppa"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Fullt namn: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Om: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direkte melding til %s sendt"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Ein feil oppstod ved sending av direkte melding."
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Slett denne notisen"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Melding lagra"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Svar på denne notisen"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Spesifer namnet til brukaren du vil tinge"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Tingar %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Kommando ikkje implementert."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notifikasjon av."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Kan ikkje skru av notifikasjon."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notifikasjon på."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6465,6 +6696,10 @@ msgid "Repeat this notice?"
msgstr "Svar på denne notisen"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Jau"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Svar på denne notisen"
@@ -6663,47 +6898,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 380bb740f..b4a417360 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:04+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:34+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Zamknięte"
msgid "Save access settings"
msgstr "Zapisz ustawienia dostępu"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Zapisz"
@@ -108,7 +113,7 @@ msgstr "Nie ma takiej strony."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Brak takiego użytkownika."
@@ -351,7 +356,7 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem."
msgid "This status is already a favorite."
msgstr "Ten stan jest już ulubiony."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Nie można utworzyć ulubionego wpisu."
@@ -468,7 +473,7 @@ msgstr "Nie odnaleziono grupy."
msgid "You are already a member of that group."
msgstr "Jesteś już członkiem tej grupy."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
@@ -519,17 +524,17 @@ msgid "Invalid token."
msgstr "Nieprawidłowy token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Token żądania %s został odrzucony lub unieważniony."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Nieoczekiwane wysłanie formularza."
@@ -824,27 +832,44 @@ msgstr ""
"do ciebie zostanie usunięta, nie będzie mógł cię subskrybować w przyszłości "
"i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nie"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Nie blokuj tego użytkownika"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Tak"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
@@ -857,8 +882,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Nie ma takiej grupy."
@@ -917,16 +942,24 @@ msgstr "Nierozpoznany typ adresu %s."
msgid "That address has already been confirmed."
msgstr "Ten adres został już potwierdzony."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Nie można zaktualizować użytkownika."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Nie można usunąć potwierdzenia adresu e-mail."
@@ -980,11 +1013,13 @@ msgstr ""
"Na pewno usunąć tę aplikację? Wyczyści to wszystkie dane o aplikacji z bazy "
"danych, w tym wszystkie istniejące połączenia użytkowników."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Nie usuwaj tej aplikacji"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Usuń tę aplikację"
@@ -1019,11 +1054,13 @@ msgstr "Usuń wpis"
msgid "Are you sure you want to delete this notice?"
msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -1047,7 +1084,8 @@ msgstr ""
"Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z "
"bazy danych, bez utworzenia kopii zapasowej."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Usuń tego użytkownika"
@@ -1158,15 +1196,13 @@ msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Zapisz"
@@ -1292,31 +1328,43 @@ msgstr "Nie można utworzyć aliasów."
msgid "Options saved."
msgstr "Zapisano opcje."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Ustawienia adresu e-mail"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adres e-mail"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Obecnie potwierdzone adresy e-mail."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Usuń"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1325,106 +1373,141 @@ msgstr ""
"(także w wiadomościach niechcianych), czy otrzymałeś wiadomość z dalszymi "
"instrukcjami."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Anuluj"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adres e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Dodaj"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Wiadomości przychodzące"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Nowe"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferencje"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Wyślij wpisy nowych subskrypcji przez e-mail."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Opublikuj MicroID adresu e-mail."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Zapisano preferencje."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Zapisano preferencje wyglądu."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Brak adresu e-mail."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Ten adres e-mail jest już twój."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Ten adres e-mail należy już do innego użytkownika."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1433,43 +1516,56 @@ msgstr ""
"skrzynce odbiorczej (także w wiadomościach niechcianych), czy otrzymałeś kod "
"i instrukcje dotyczące jego użycia."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Brak oczekujących potwierdzeń do anulowania."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "To jest błędny adres komunikatora."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Anulowano potwierdzenie."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "To nie jest twój adres e-mail."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Adres został usunięty."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Brak przychodzącego adresu e-mail."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Nie można zaktualizować wpisu użytkownika."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Usunięto przychodzący adres e-mail."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Dodano nowy przychodzący adres e-mail."
@@ -1660,15 +1756,17 @@ msgstr ""
"Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i subskrybować "
"grupy w przyszłości."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Nie blokuj tego użytkownika w tej grupie"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Zablokuj tego użytkownika w tej grupie"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
@@ -1847,11 +1945,15 @@ msgstr "Użytkownik nie został zablokowany w grupie."
msgid "Error removing the block."
msgstr "Błąd podczas usuwania blokady."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Ustawienia komunikatora"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1860,15 +1962,24 @@ msgstr ""
"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
"Skonfiguruj adres i ustawienia poniżej."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "Komunikator nie jest dostępny."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adres komunikatora"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1878,11 +1989,9 @@ msgstr ""
"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
"znajomych?)."
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adres komunikatora"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1891,44 +2000,66 @@ msgstr ""
"Adres Jabber lub GTalk, taki jak \"NazwaUżytkownika@example.org\". Najpierw "
"upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencje"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Wyślij mi wpisy przez Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Opublikuj MicroID adresu Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Zapisano preferencje."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Brak identyfikatora Jabbera."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Nie można znormalizować tego identyfikatora Jabbera"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "To nie jest prawidłowy identyfikator Jabbera"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Ten identyfikator Jabbera jest już twój."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Identyfikator Jabbera należy już do innego użytkownika."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1937,10 +2068,35 @@ msgstr ""
"Kod potwierdzający został wysłany na dodany adres komunikatora. Należy "
"zaakceptować otrzymywanie wiadomości od %s."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "To jest błędny adres komunikatora."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Nie można usunąć potwierdzenia adresu e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Anulowano potwierdzenie."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "To nie jest twój identyfikator Jabbera."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adres został usunięty."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1983,7 +2139,9 @@ msgstr "Zaproś nowych użytkowników"
msgid "You are already subscribed to these users:"
msgstr "Jesteś już subskrybowany do tych użytkowników:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2107,7 +2265,9 @@ msgstr "Musisz być zalogowany, aby dołączyć do grupy."
msgid "No nickname or ID."
msgstr "Brak pseudonimu lub identyfikatora."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "Użytkownik %1$s dołączył do grupy %2$s"
@@ -2116,11 +2276,13 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s"
msgid "You must be logged in to leave a group."
msgstr "Musisz być zalogowany, aby opuścić grupę."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Nie jesteś członkiem tej grupy."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
@@ -2231,12 +2393,12 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę."
msgid "New message"
msgstr "Nowa wiadomość"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Nie można wysłać wiadomości do tego użytkownika."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Brak treści."
@@ -2244,7 +2406,7 @@ msgstr "Brak treści."
msgid "No recipient specified."
msgstr "Nie podano odbiorcy."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -2500,7 +2662,7 @@ msgid "6 or more characters"
msgstr "6 lub więcej znaków"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Potwierdź"
@@ -3893,44 +4055,74 @@ msgstr ""
msgid "Save site notice"
msgstr "Zapisz wpis witryny"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Ustawienia SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Można otrzymywać wiadomości SMS przez e-mail od %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Wiadomości SMS nie są dostępne."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adres komunikatora"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Kod potwierdzający"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Podaj kod, który otrzymałeś na telefonie."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Numer telefonu SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencje"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3938,23 +4130,34 @@ msgstr ""
"Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od "
"swojego operatora."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Zapisano preferencje."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Brak numeru telefonu."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Nie wybrano operatora."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Ten numer telefonu jest już twój."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Ten numer telefonu należy już do innego użytkownika."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3962,23 +4165,42 @@ msgstr ""
"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, "
"czy otrzymałeś kod i instrukcje jak go użyć."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "To jest błędny numer potwierdzenia."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Anulowano potwierdzenie."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "To nie jest twój numer telefonu."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numer telefonu SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operator komórkowy"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Wybierz operatora"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3988,7 +4210,8 @@ msgstr ""
"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Nie podano kodu"
@@ -5193,10 +5416,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Anuluj"
@@ -5272,34 +5493,40 @@ msgstr "Polecenie nie powiodło się"
msgid "Notice with that id does not exist"
msgstr "Wpis z tym identyfikatorem nie istnieje."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Użytkownik nie posiada ostatniego wpisu."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Nie można odnaleźć lokalnego użytkownika z pseudonimem %s."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Wysłano szturchnięcie do użytkownika %s."
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5310,57 +5537,55 @@ msgstr ""
"Subskrybenci: %2$s\n"
"Wpisy: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Zaznaczono wpis jako ulubiony."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Jesteś już członkiem tej grupy."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "Użytkownik %1$s dołączył do grupy %2$s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "Użytkownik %1$s opuścił grupę %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Imię i nazwisko: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Położenie: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "O mnie: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5369,143 +5594,149 @@ msgstr ""
"%s to zdalny profil; można wysyłać bezpośrednie wiadomości tylko do "
"użytkowników na tym samym serwerze."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Nie można powtórzyć własnego wpisu"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Już powtórzono ten wpis"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Powtórzono wpis od użytkownika %s"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Błąd podczas powtarzania wpisu."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Wysłano odpowiedź do %s."
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Błąd podczas zapisywania wpisu."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Podaj nazwę użytkownika do subskrybowania."
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Subskrybowano użytkownika %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Nie zaimplementowano polecenia."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Wyłączono powiadomienia."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Nie można wyłączyć powiadomień."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Włączono powiadomienia."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Polecenie logowania jest wyłączone"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
"minuty: %s."
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tę osobę:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba cię subskrybuje:"
msgstr[1] "Te osoby cię subskrybują:"
msgstr[2] "Te osoby cię subskrybują:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6476,6 +6707,10 @@ msgid "Repeat this notice?"
msgstr "Powtórzyć ten wpis?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Tak"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Powtórz ten wpis"
@@ -6662,47 +6897,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index c0220c82b..8d95f07c8 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:07+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:37+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "Fechado"
msgid "Save access settings"
msgstr "Gravar configurações do site"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -109,7 +114,7 @@ msgstr "Página não encontrada."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Utilizador não encontrado."
@@ -350,7 +355,7 @@ msgstr "Nenhum estado encontrado com esse ID."
msgid "This status is already a favorite."
msgstr "Este estado já é um favorito."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Não foi possível criar o favorito."
@@ -468,7 +473,7 @@ msgstr "Grupo não foi encontrado!"
msgid "You are already a member of that group."
msgstr "Já é membro desse grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Foi bloqueado desse grupo pelo gestor."
@@ -520,17 +525,17 @@ msgid "Invalid token."
msgstr "Tamanho inválido."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Envio inesperado de formulário."
@@ -827,27 +835,44 @@ msgstr ""
"subscrição por este utilizador será cancelada, ele não poderá subscrevê-lo "
"de futuro e você não receberá notificações das @-respostas dele."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Não"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
@@ -860,8 +885,8 @@ msgstr "Não foi possível gravar informação do bloqueio."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Grupo não foi encontrado."
@@ -920,16 +945,24 @@ msgstr "Tipo do endereço %s não reconhecido"
msgid "That address has already been confirmed."
msgstr "Esse endereço já tinha sido confirmado."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Não foi possível actualizar o utilizador."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Não foi possível apagar a confirmação do endereço electrónico."
@@ -989,12 +1022,14 @@ msgstr ""
"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
"utilizador serão eliminados da base de dados, sem haver cópias."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Não apagar esta nota"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Apagar esta nota"
@@ -1030,11 +1065,13 @@ msgstr "Apagar nota"
msgid "Are you sure you want to delete this notice?"
msgstr "Tem a certeza de que quer apagar esta nota?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -1058,7 +1095,8 @@ msgstr ""
"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
"utilizador serão eliminados da base de dados, sem haver cópias."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Apagar este utilizador"
@@ -1171,15 +1209,13 @@ msgid "Reset back to default"
msgstr "Repor predefinição"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Gravar"
@@ -1317,31 +1353,43 @@ msgstr "Não foi possível criar sinónimos."
msgid "Options saved."
msgstr "Opções gravadas."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Configurações do correio electrónico"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Defina como receberá mensagens electrónicas de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Endereço"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Endereço de correio electrónico"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Endereço de correio já confirmado."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1349,111 +1397,146 @@ msgstr ""
"A aguardar a confirmação deste endereço. Procure na sua caixa de entrada (ou "
"na caixa de spam!) uma mensagem com mais instruções."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Endereço de correio electrónico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correio recebido"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie mensagens electrónicas para este endereço para publicar notas."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferências"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Enviem-me notificação electrónica das novas subscrições."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviem-me notificação electrónica quando uma nota minha é adicionada às "
"favoritas."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviem-me notificação electrónica quando me enviarem uma mensagem privada."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir que amigos me toquem e enviem mensagens electrónicas."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Quero publicar notas por correio electrónico."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicar uma MicroID para o meu endereço electrónico."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferências gravadas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferências de estilo foram gravadas."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Sem endereço de correio electrónico."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Esse já é o seu endereço electrónico."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Esse endereço electrónico já pertence a outro utilizador."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1462,43 +1545,56 @@ msgstr ""
"forneceu. Procure na caixa de entrada (e na caixa de spam!) o código e as "
"respectivas instruções de utilização."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Esse endereço de mensagens instantâneas está errado."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Confirmação cancelada."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Esse não é o seu endereço electrónico."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "O endereço foi removido."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Sem endereço electrónico de entrada."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Não foi possível actualizar o registo do utilizador."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Endereço electrónico de entrada foi removido."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Adicionado endereço electrónico de entrada novo."
@@ -1692,15 +1788,17 @@ msgstr ""
"\"%2$s\"? Ele será removido do grupo, impossibilitado de publicar e "
"impossibilitado de subscrever o grupo no futuro."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Não bloquear acesso deste utilizador a este grupo"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Bloquear acesso deste utilizador a este grupo"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
@@ -1883,11 +1981,15 @@ msgstr "Acesso do utilizador ao grupo não foi bloqueado."
msgid "Error removing the block."
msgstr "Erro ao remover o bloqueio."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Configurações do IM"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1896,15 +1998,24 @@ msgstr ""
"Pode enviar e receber notas através de [mensagens instantâneas](%%doc.im%%) "
"Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "MI não está disponível."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Endereço IM"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Endereço do Jabber/GTalk já confirmado."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1914,11 +2025,9 @@ msgstr ""
"enviadas para a sua conta de Jabber/GTalk. (Adicionou %s à sua lista de "
"amigos?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Endereço IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1928,43 +2037,65 @@ msgstr ""
"Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente "
"MI ou no GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferências"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Enviar-me notas via Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que não subscrevo."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicar uma MicroID para o meu endereço Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferências gravadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Não introduziu o Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Não é possível normalizar esse Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Jabber ID não é válido"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Esse já é o seu Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "O Jabber ID introduzido já pertence a outro utilizador."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1973,10 +2104,35 @@ msgstr ""
"Um código de confirmação foi enviado para o endereço fornecido. Tem que "
"aprovar que %s envie mensagens para si."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esse endereço de mensagens instantâneas está errado."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Não foi possível apagar a confirmação do endereço electrónico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmação cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Esse não é o seu Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "O endereço foi removido."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2021,7 +2177,9 @@ msgstr "Convidar novos utilizadores"
msgid "You are already subscribed to these users:"
msgstr "Já subscreveu estes utilizadores:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2145,7 +2303,9 @@ msgstr "Precisa de iniciar uma sessão para se juntar a um grupo."
msgid "No nickname or ID."
msgstr "Nenhuma utilizador."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s juntou-se ao grupo %2$s"
@@ -2154,11 +2314,13 @@ msgstr "%1$s juntou-se ao grupo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Precisa de iniciar uma sessão para deixar um grupo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Não é um membro desse grupo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -2274,12 +2436,12 @@ msgstr "Use este formulário para criar um grupo novo."
msgid "New message"
msgstr "Mensagem nova"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Não pode enviar uma mensagem a este utilizador."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Sem conteúdo!"
@@ -2287,7 +2449,7 @@ msgstr "Sem conteúdo!"
msgid "No recipient specified."
msgstr "Não especificou um destinatário."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -2553,7 +2715,7 @@ msgid "6 or more characters"
msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmação"
@@ -3960,44 +4122,74 @@ msgstr ""
msgid "Save site notice"
msgstr "Aviso do site"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Configurações de SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Pode receber SMSs do site %%site.name%% por correio electrónico."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS não está disponível."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Endereço IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Número de telefone com serviço SMS activo já confirmado."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "A aguardar confirmação deste número de telefone."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Código de confirmação"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Introduza o código que recebeu no seu telefone."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmação"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Número de telefone para SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferências"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -4005,23 +4197,34 @@ msgstr ""
"Enviem-me notas por SMS; compreendo que o meu operador poderá vir a facturar-"
"me montantes exorbitantes."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferências gravadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Nenhum número de telefone."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Operador não foi seleccionado."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Esse já é o seu número de telefone."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Esse número de telefone já pertence a outro utilizador."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4030,23 +4233,42 @@ msgstr ""
"no seu telefone se recebeu o código e as respectivas instruções de "
"utilização."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Esse número de confirmação está errado."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmação cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Esse número de telefone não é o seu."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Número de telefone para SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operador móvel"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Seleccione um operador"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4056,7 +4278,8 @@ msgstr ""
"electrónico mas não está listado, diga-nos enviando um correio electrónico "
"para %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Nenhum código introduzido"
@@ -5289,10 +5512,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancelar"
@@ -5366,34 +5587,40 @@ msgstr "Comando falhou"
msgid "Notice with that id does not exist"
msgstr "Não existe nenhuma nota com essa identificação"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Utilizador não tem nenhuma última nota"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Não foi encontrado um utilizador com a alcunha %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Não foi encontrado um utilizador com a alcunha %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Desculpe, este comando ainda não foi implementado."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Cotovelada enviada a %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5404,198 +5631,202 @@ msgstr ""
"Subscritores: %2$s\n"
"Notas: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Nota marcada como favorita."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Já é membro desse grupo"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Não foi possível juntar o utilizador %s ao grupo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s juntou-se ao grupo %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Não foi possível remover o utilizador %s do grupo %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s deixou o grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Mensagem directa para %s enviada"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Erro no envio da mensagem directa."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Não pode repetir a sua própria nota"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Já repetiu essa nota"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Nota de %s repetida"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Erro ao repetir nota."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Resposta a %s enviada"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Erro ao gravar nota."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Não subscreveu esse perfil."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Subscreveu %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Introduza o nome do utilizador para deixar de subscrever"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Comando ainda não implementado."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Não foi possível desligar a notificação."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Comando para iniciar sessão foi desactivado"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
"s"
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreveu esta pessoa:"
msgstr[1] "Subscreveu estas pessoas:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa subscreve as suas notas:"
msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
-#: lib/command.php:812
+#: lib/command.php:838
#, fuzzy
msgid ""
"Commands:\n"
@@ -6540,6 +6771,10 @@ msgid "Repeat this notice?"
msgstr "Repetir esta nota?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sim"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repetir esta nota"
@@ -6728,47 +6963,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderar"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 68752209f..ee53b8346 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:10+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:40+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -75,8 +75,13 @@ msgstr "Fechado"
msgid "Save access settings"
msgstr "Salvar as configurações de acesso"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Salvar"
@@ -107,7 +112,7 @@ msgstr "Esta página não existe."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Este usuário não existe."
@@ -352,7 +357,7 @@ msgstr "Não foi encontrado nenhum status com esse ID."
msgid "This status is already a favorite."
msgstr "Esta mensagem já é favorita!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Não foi possível criar a favorita."
@@ -471,7 +476,7 @@ msgstr "O grupo não foi encontrado!"
msgid "You are already a member of that group."
msgstr "Você já é membro desse grupo."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "O administrador desse grupo bloqueou sua inscrição."
@@ -522,17 +527,17 @@ msgid "Invalid token."
msgstr "Token inválido."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -568,12 +573,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "O token %s solicitado foi negado e revogado."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Submissão inesperada de formulário."
@@ -834,27 +842,44 @@ msgstr ""
"nenhuma notificação acerca de qualquer citação (@usuário) que ele fizer de "
"você."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Não"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -867,8 +892,8 @@ msgstr "Não foi possível salvar a informação de bloqueio."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Esse grupo não existe."
@@ -927,16 +952,24 @@ msgstr "Tipo de endereço desconhecido %s"
msgid "That address has already been confirmed."
msgstr "Esse endereço já foi confirmado."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Não foi possível atualizar o usuário."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Não foi possível excluir a confirmação de e-mail."
@@ -991,11 +1024,13 @@ msgstr ""
"desta aplicação do banco de dados, incluindo todas as conexões existentes "
"com os usuários."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Não excluir esta aplicação"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Excluir esta aplicação"
@@ -1030,11 +1065,13 @@ msgstr "Excluir a mensagem"
msgid "Are you sure you want to delete this notice?"
msgstr "Tem certeza que deseja excluir esta mensagem?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -1058,7 +1095,8 @@ msgstr ""
"Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
"deste usuário do banco de dados, sem cópia de segurança."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Excluir este usuário"
@@ -1171,15 +1209,13 @@ msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Salvar"
@@ -1305,31 +1341,43 @@ msgstr "Não foi possível criar os apelidos."
msgid "Options saved."
msgstr "As configurações foram salvas."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Configurações do e-mail"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Configure o recebimento de e-mails de %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Endereço"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Endereço de e-mail"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Endereço de e-mail já confirmado."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1337,110 +1385,145 @@ msgstr ""
"Aguardando a confirmação deste endereço. Procure em sua caixa de entrada (e "
"de spam!) por uma mensagem com mais instruções."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Endereço de e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "E-mail de recebimento"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Preferências"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Envie-me notificações de novos assinantes por e-mail."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
"favorita."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Envie-me um e-mail quando alguém me mandar uma mensagem particular."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Envie-me um e-mail quando alguém mandar uma mensagem citando meu nome "
"(\"@nome\")."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Eu quero publicar mensagens por e-mail."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publique um MicroID para meu endereço de e-mail."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "As preferências foram salvas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "As configurações da aparência foram salvas."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Nenhum endereço de e-mail."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Esse já é seu endereço de e-mail."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Esse endereço de e-mail já pertence à outro usuário."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1449,43 +1532,56 @@ msgstr ""
"informou. Verifique a sua caixa de entrada (e de spam!) para o código e "
"instruções sobre como usá-lo."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Isso é um endereço de MI errado."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "A confirmação foi cancelada."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Esse não é seu endereço de email."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "O endereço foi removido."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nenhum endereço de e-mail para recebimentos."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Não foi possível atualizar o registro do usuário."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "O endereço de e-mail de recebimento foi removido."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -1678,15 +1774,17 @@ msgstr ""
"será removido do grupo e impossibilitado de publicar e de se juntar ao grupo "
"futuramente."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Não bloquear este usuário neste grupo"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Bloquear este usuário neste grupo"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
"Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo."
@@ -1870,11 +1968,15 @@ msgstr "O usuário não está bloqueado no grupo."
msgid "Error removing the block."
msgstr "Erro na remoção do bloqueio."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Configurações do MI"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1883,15 +1985,24 @@ msgstr ""
"Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%"
"%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "MI não está disponível"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Endereço do MI"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Endereço de Jabber/GTalk já confirmado."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1901,11 +2012,9 @@ msgstr ""
"GTalk por uma mensagem com mais instruções (Você adicionou %s à sua lista de "
"contatos?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Endereço do MI"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1915,45 +2024,67 @@ msgstr ""
"certifique-se de adicionar %s à sua lista de contatos em seu cliente de MI "
"ou no GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferências"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Envie-me mensagens via Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Envie-me respostas de pessoas que eu não estou assinando através do Jabber/"
"GTalk."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "As preferências foram salvas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Nenhuma ID de Jabber."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Não foi possível normalizar essa ID do Jabber"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Não é uma ID de Jabber válida"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Essa já é sua ID do Jabber."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Esta ID do Jabber já pertence à outro usuário."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1962,10 +2093,35 @@ msgstr ""
"Um código de confirmação foi enviado para o endereço de IM que você "
"informou. Você deve permitir que %s envie mensagens para você."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Isso é um endereço de MI errado."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Não foi possível excluir a confirmação de e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "A confirmação foi cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Essa não é sua ID do Jabber."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "O endereço foi removido."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2009,7 +2165,9 @@ msgstr "Convidar novos usuários"
msgid "You are already subscribed to these users:"
msgstr "Você já está assinando esses usuários:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2132,7 +2290,9 @@ msgstr "Você deve estar autenticado para se associar a um grupo."
msgid "No nickname or ID."
msgstr "Nenhum apelido ou identificação."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s associou-se ao grupo %2$s"
@@ -2141,11 +2301,13 @@ msgstr "%1$s associou-se ao grupo %2$s"
msgid "You must be logged in to leave a group."
msgstr "Você deve estar autenticado para sair de um grupo."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Você não é um membro desse grupo."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -2260,12 +2422,12 @@ msgstr "Utilize este formulário para criar um novo grupo."
msgid "New message"
msgstr "Nova mensagem"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Você não pode enviar mensagens para este usuário."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Nenhum conteúdo!"
@@ -2273,7 +2435,7 @@ msgstr "Nenhum conteúdo!"
msgid "No recipient specified."
msgstr "Não foi especificado nenhum destinatário."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2536,7 +2698,7 @@ msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Confirmar"
@@ -3936,44 +4098,74 @@ msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)"
msgid "Save site notice"
msgstr "Salvar os avisos do site"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Configuração do SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Você pode receber mensagens SMS de %%site.name%% através do e-mail."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS não está disponível."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Endereço do MI"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Número de telefone já habilitado para receber SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Aguardando a confirmação deste número de telefone."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Código de confirmação"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Informe o código que você recebeu no seu telefone."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Telefone para SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferências"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3981,23 +4173,34 @@ msgstr ""
"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças "
"exorbitantes da minha operadora."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "As preferências foram salvas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Nenhum número de telefone."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Não foi selecionada nenhuma operadora."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Esse já é seu número de telefone."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Esse número de telefone já pertence à outro usuário."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -4005,23 +4208,42 @@ msgstr ""
"Um código de confirmação foi enviado para o número de telefone que você "
"informou. Verifique no seu telefone o código e instruções sobre como usá-lo."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Isso é um número de confirmação errado."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "A confirmação foi cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Esse não é seu número de telefone."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefone para SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Operadora de celular"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Selecione uma operadora"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4030,7 +4252,8 @@ msgstr ""
"A operadora do seu celular. Se você conhece uma operadora que aceita SMS via "
"e-mail que não está listada aqui, informe-nos enviando uma mensagem para %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Não foi digitado nenhum código"
@@ -5232,10 +5455,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Acesso padrão para esta aplicação: somente leitura ou leitura e escrita"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Cancelar"
@@ -5311,34 +5532,40 @@ msgstr "O comando falhou"
msgid "Notice with that id does not exist"
msgstr "Não existe uma mensagem com essa id"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "O usuário não tem uma \"última mensagem\""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Não foi possível encontrar um usuário com a identificação %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Não foi possível encontrar um usuário local com a identificação %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Desculpe, mas esse comando ainda não foi implementado."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido chamar a sua própria atenção!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Foi enviada a chamada de atenção para %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5349,57 +5576,55 @@ msgstr ""
"Assinantes: %2$s\n"
"Mensagens: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Mensagem marcada como favorita."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Você já é um membro desse grupo."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Não foi possível associar o usuário %s ao grupo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s associou-se ao grupo %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Não foi possível remover o usuário %s do grupo %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s deixou o grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Sobre: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5408,142 +5633,148 @@ msgstr ""
"%s é um perfil remoto; você pode só pode enviar mensagens diretas para "
"usuários do mesmo servidor."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "A mensagem direta para %s foi enviada"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Ocorreu um erro durante o envio da mensagem direta."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Você não pode repetir sua própria mensagem"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Você já repetiu essa mensagem"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Mensagem de %s repetida"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Erro na repetição da mensagem."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "A resposta a %s foi enviada"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Erro no salvamento da mensagem."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Especifique o nome do usuário que será assinado"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Não é possível assinar perfis OMB com comandos."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Efetuada a assinatura de %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifique o nome do usuário cuja assinatura será cancelada"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "O comando não foi implementado ainda."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Não é possível desligar a notificação."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "O comando para autenticação está desabilitado"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
"s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esta pessoa:"
msgstr[1] "Você já está assinando estas pessoas:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa está assinando você:"
msgstr[1] "Estas pessoas estão assinando você:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você é membro deste grupo:"
msgstr[1] "Você é membro destes grupos:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6490,6 +6721,10 @@ msgid "Repeat this notice?"
msgstr "Repetir esta mensagem?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sim"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Repetir esta mensagem"
@@ -6675,47 +6910,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderador"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 8fe51a80c..64a9934d1 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:16+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:43+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Закрыта"
msgid "Save access settings"
msgstr "Сохранить настройки доступа"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Сохранить"
@@ -108,7 +113,7 @@ msgstr "Нет такой страницы."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Нет такого пользователя."
@@ -350,7 +355,7 @@ msgstr "Нет статуса с таким ID."
msgid "This status is already a favorite."
msgstr "Этот статус уже входит в число любимых."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Не удаётся создать любимую запись."
@@ -471,7 +476,7 @@ msgstr "Группа не найдена."
msgid "You are already a member of that group."
msgstr "Вы уже являетесь членом этой группы."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Вы заблокированы из этой группы администратором."
@@ -522,17 +527,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Запрос токена %s был запрещен и аннулирован."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Нетиповое подтверждение формы."
@@ -829,27 +837,44 @@ msgstr ""
"будет отписан от вас без возможности подписаться в будущем, а вам не будут "
"приходить уведомления об @-ответах от него."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Нет"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не блокировать этого пользователя"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
@@ -862,8 +887,8 @@ msgstr "Не удаётся сохранить информацию о блок
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Нет такой группы."
@@ -922,16 +947,24 @@ msgstr "Нераспознанный тип адреса %s."
msgid "That address has already been confirmed."
msgstr "Этот адрес уже подтверждён."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Не удаётся обновить пользователя."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не удаётся удалить подверждение по электронному адресу."
@@ -986,11 +1019,13 @@ msgstr ""
"применении из базы данных, включая все существующие подключения "
"пользователей."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Не удаляйте это приложение"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Удалить это приложение"
@@ -1025,11 +1060,13 @@ msgstr "Удалить запись"
msgid "Are you sure you want to delete this notice?"
msgstr "Вы уверены, что хотите удалить эту запись?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Не удалять эту запись"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Удалить эту запись"
@@ -1053,7 +1090,8 @@ msgstr ""
"Вы действительно хотите удалить этого пользователя? Это повлечёт удаление "
"всех данных о пользователе из базы данных без возможности восстановления."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Удалить этого пользователя"
@@ -1166,15 +1204,13 @@ msgid "Reset back to default"
msgstr "Восстановить значения по умолчанию"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Сохранить"
@@ -1300,31 +1336,43 @@ msgstr "Не удаётся создать алиасы."
msgid "Options saved."
msgstr "Настройки сохранены."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Настройка почты"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Управление процессом получения электронной почты с %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Адрес"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Адрес эл. почты"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Подтверждённый в настоящее время электронный адрес."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Убрать"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1332,116 +1380,151 @@ msgstr ""
"Ожидание подтверждения этого адреса. Проверьте свой почтовый ящик (и папку "
"для спама!), там будут дальнейшие инструкции."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Отменить"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Адрес эл. почты"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Электронный адрес вида \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Добавить"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Входящий электронный адрес"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Отправляйте электронные письма на этот адрес для отсылки новых записей."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Создать новый адрес электронной почты для отсылки сообщений; отменяет старый "
"адрес."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Новый"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Предпочтения"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Уведомлять меня о новых подписчиках по почте."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
"запись в число любимых."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
"приватное сообщение."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
"ответ»."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Я хочу отправлять записи по электронной почте."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Опубликовать MicroID для моего электронного адреса."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Предпочтения сохранены."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Настройки оформления сохранены."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Нет электронного адреса."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неверный электронный адрес."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Это уже Ваш электронный адрес."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Этот электронный адрес уже задействован другим пользователем."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не удаётся вставить код подтверждения."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1450,43 +1533,56 @@ msgstr ""
"папку входящей почты (а также папку спама!), чтобы найти этот кода и "
"инструкции по его использованию."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Нет подтверждения отказа."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Это неверный IM-адрес."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Подтверждение отменено."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Это не Ваш электронный адрес."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Адрес удалён."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Нет входящего электронного адреса."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не удаётся обновить пользовательскую запись."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Входящий электронный адрес удалён."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Новый входящий электронный адрес добавлен."
@@ -1677,15 +1773,17 @@ msgstr ""
"Пользователь будет удалён из группы без возможности отправлять и "
"подписываться на группу в будущем."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Не блокировать этого пользователя из этой группы"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Заблокировать этого пользователя из этой группы"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Ошибка базы данных при блокировании пользователя из группы."
@@ -1868,11 +1966,15 @@ msgstr "Пользователь не заблокировал вас из гр
msgid "Error removing the block."
msgstr "Ошибка при удалении данного блока."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM-установки"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1881,15 +1983,24 @@ msgstr ""
"Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]"
"(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM не доступен."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-адрес"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1899,11 +2010,9 @@ msgstr ""
"сообщения с дальнейшими инструкциями. (Вы включили %s в ваш список "
"контактов?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-адрес"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1913,44 +2022,66 @@ msgstr ""
"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем IM-"
"мессенджере или в GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Предпочтения"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Посылать мне записи через Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Предпочтения сохранены."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Не Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Не удаётся стандартизировать этот Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Неверный код Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Это уже Ваш Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Этот Jabber ID уже используется другим пользователем."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1959,10 +2090,35 @@ msgstr ""
"Код подтверждения выслан на добавленный вами IM-адрес. Вы должны подтвердить "
"%s для отправки вам сообщений."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Это неверный IM-адрес."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Не удаётся удалить подверждение по электронному адресу."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Подтверждение отменено."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Это не Ваш Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Адрес удалён."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2007,7 +2163,9 @@ msgstr "Пригласить новых пользователей"
msgid "You are already subscribed to these users:"
msgstr "Вы уже подписаны на пользователя:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2130,7 +2288,9 @@ msgstr "Вы должны авторизоваться для вступлени
msgid "No nickname or ID."
msgstr "Нет имени или ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s вступил в группу %2$s"
@@ -2139,11 +2299,13 @@ msgstr "%1$s вступил в группу %2$s"
msgid "You must be logged in to leave a group."
msgstr "Вы должны авторизоваться, чтобы покинуть группу."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Вы не являетесь членом этой группы."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
@@ -2253,12 +2415,12 @@ msgstr "Используйте эту форму для создания нов
msgid "New message"
msgstr "Новое сообщение"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Вы не можете послать сообщение этому пользователю."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Нет контента!"
@@ -2266,7 +2428,7 @@ msgstr "Нет контента!"
msgid "No recipient specified."
msgstr "Нет адресата."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -2523,7 +2685,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Подтверждение"
@@ -3912,46 +4074,76 @@ msgstr "Текст уведомления сайта (максимум 255 си
msgid "Save site notice"
msgstr "Сохранить уведомление сайта"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Установки СМС"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
"Вы можете отправлять СМС-сообщения по электронному адресу от %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "Отправка СМС недоступна."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-адрес"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
"Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "В ожидании подтверждения данного номера телефона."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Код подтверждения"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Введите код, который вы получили по телефону."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Подтверждение"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Номер телефона для СМС"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Номер телефона, без пробелов, с кодом зоны"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Предпочтения"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3959,23 +4151,34 @@ msgstr ""
"Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
"по пересылке."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Предпочтения сохранены."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Нет номера телефона."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Провайдер не выбран."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Это уже ваш номер телефона."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Этот телефонный номер уже задействован другим пользователем."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3983,23 +4186,42 @@ msgstr ""
"Код подтверждения выслан на мобильный номер, который вы добавили. Проверьте "
"телефон для нахождения этого кода и инструкций по его использованию."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Это неверный номер подтверждения."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Подтверждение отменено."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Это не Ваш номер телефона."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Номер телефона для СМС"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Выбор провайдера"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Выбор провайдера"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4009,7 +4231,8 @@ msgstr ""
"принимает СМС при помощи электронных адресов и которого нет в списке ниже, "
"то сообщите нам об этом по электронной почте %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Код не введён"
@@ -5209,10 +5432,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Доступ по умолчанию для этого приложения: только чтение или чтение и запись"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Отменить"
@@ -5288,34 +5509,40 @@ msgstr "Команда неудачна"
msgid "Notice with that id does not exist"
msgstr "Записи с таким id не существует"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "У пользователя нет последней записи."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не удаётся найти пользователя с именем %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Не удаётся найти пользователя с именем %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Простите, эта команда ещё не выполнена."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Нет смысла «подталкивать» самого себя!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "«Подталкивание» послано %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5326,57 +5553,55 @@ msgstr ""
"Подписчиков: %2$s\n"
"Записей: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Запись помечена как любимая."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Вы уже являетесь членом этой группы."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Не удаётся присоединить пользователя %s к группе %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%1$s вступил в группу %2$s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Не удаётся удалить пользователя %1$s из группы %2$s."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s покинул группу %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Полное имя: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Месторасположение: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Домашняя страница: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "О пользователе: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5385,141 +5610,148 @@ msgstr ""
"%s профиль другой системы; вы можете отсылать личное сообщение только "
"пользователям этой системы."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Прямое сообщение для %s послано."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Ошибка при отправке прямого сообщения."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Невозможно повторить собственную запись."
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Эта запись уже повторена"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Запись %s повторена"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Ошибка при повторении записи."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Ответ %s отправлен"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Проблемы с сохранением записи."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Укажите имя пользователя для подписки."
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Невозможно подписаться командой на профили OMB."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Подписано на %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Укажите имя пользователя для отмены подписки."
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписано от %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Команда ещё не выполнена."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Оповещение отсутствует."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Нет оповещения."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Есть оповещение."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Команда входа отключена"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Отписано %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
msgstr[1] "Вы подписаны на этих людей:"
msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
msgstr[1] "Эти люди подписались на вас:"
msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
msgstr[1] "Вы являетесь участником следующих групп:"
msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6488,6 +6720,10 @@ msgid "Repeat this notice?"
msgstr "Повторить эту запись?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Да"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Повторить эту запись"
@@ -6673,47 +6909,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 61d593bcf..c7ecc89f0 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,8 +69,13 @@ msgstr ""
msgid "Save access settings"
msgstr ""
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr ""
@@ -100,7 +105,7 @@ msgstr ""
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr ""
@@ -329,7 +334,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -445,7 +450,7 @@ msgstr ""
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -496,17 +501,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -537,12 +542,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -794,27 +802,42 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
msgid "No"
msgstr ""
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr ""
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -827,8 +850,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr ""
@@ -887,16 +910,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr ""
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr ""
@@ -948,11 +979,13 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr ""
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr ""
@@ -985,11 +1018,13 @@ msgstr ""
msgid "Are you sure you want to delete this notice?"
msgstr ""
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr ""
@@ -1011,7 +1046,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr ""
@@ -1122,15 +1158,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
@@ -1256,178 +1290,229 @@ msgstr ""
msgid "Options saved."
msgstr ""
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr ""
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
msgstr ""
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr ""
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
msgid "Remove"
msgstr ""
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
msgid "Cancel"
msgstr ""
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr ""
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
msgid "Add"
msgstr ""
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
msgid "New"
msgstr ""
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"
msgstr ""
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
msgstr ""
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr ""
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."
msgstr ""
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."
msgstr ""
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."
msgstr ""
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1609,15 +1694,17 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr ""
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr ""
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1785,90 +1872,144 @@ msgstr ""
msgid "Error removing the block."
msgstr ""
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr ""
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr ""
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr ""
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr ""
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr ""
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr ""
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr ""
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr ""
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr ""
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr ""
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1909,7 +2050,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2002,7 +2145,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr ""
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2011,11 +2156,13 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr ""
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -2120,12 +2267,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr ""
@@ -2133,7 +2280,7 @@ msgstr ""
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2380,7 +2527,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr ""
@@ -3674,95 +3821,150 @@ msgstr ""
msgid "Save site notice"
msgstr ""
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr ""
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr ""
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+msgid "SMS address"
+msgstr ""
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+msgid "SMS confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -4902,9 +5104,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr ""
@@ -4977,34 +5178,40 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr ""
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr ""
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr ""
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5012,195 +5219,199 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr ""
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, php-format
-msgid "%s joined group %s"
+msgid "Could not remove user %s from group %s"
msgstr ""
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
-
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr ""
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr ""
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr ""
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr ""
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr ""
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr ""
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6022,6 +6233,10 @@ msgid "Repeat this notice?"
msgstr ""
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr ""
@@ -6207,47 +6422,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index be55652d3..91bf80f89 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:19+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:46+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "Stängd"
msgid "Save access settings"
msgstr "Spara inställningar för åtkomst"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Spara"
@@ -104,7 +109,7 @@ msgstr "Ingen sådan sida"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ingen sådan användare."
@@ -342,7 +347,7 @@ msgstr "Ingen status hittad med det ID:t."
msgid "This status is already a favorite."
msgstr "Denna status är redan en favorit."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Kunde inte skapa favorit."
@@ -459,7 +464,7 @@ msgstr "Grupp hittades inte."
msgid "You are already a member of that group."
msgstr "Du är redan en medlem i denna grupp."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Du har blivit blockerad från denna grupp av administratören."
@@ -510,17 +515,17 @@ msgid "Invalid token."
msgstr "Ogiltig token."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -551,12 +556,15 @@ msgstr "Begäran-token %s har godkänts. Byt ut den mot en åtkomst-token."
msgid "The request token %s has been denied and revoked."
msgstr "Begäran-token %s har nekats och återkallats."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Oväntat inskick av formulär."
@@ -815,27 +823,44 @@ msgstr ""
"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i "
"framtiden och du kommer inte bli underrättad om några @-svar från dem."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Nej"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Blockera inte denna användare"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
@@ -848,8 +873,8 @@ msgstr "Misslyckades att spara blockeringsinformation."
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Ingen sådan grupp."
@@ -909,16 +934,24 @@ msgstr "Adresstypen %s känns inte igen."
msgid "That address has already been confirmed."
msgstr "Denna adress har redan blivit bekräftad."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Kunde inte uppdatera användare."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kunde inte ta bort e-postbekräftelse."
@@ -973,11 +1006,13 @@ msgstr ""
"bort all data om applikationen från databasen, inklusive alla befintliga "
"användaranslutningar."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Ta inte bort denna applikation"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Ta bort denna applikation"
@@ -1012,11 +1047,13 @@ msgstr "Ta bort notis"
msgid "Are you sure you want to delete this notice?"
msgstr "Är du säker på att du vill ta bort denna notis?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -1040,7 +1077,8 @@ msgstr ""
"Är du säker på att du vill ta bort denna användare? Det kommer rensa all "
"data om användaren från databasen, utan en säkerhetskopia."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Ta bort denna användare"
@@ -1153,15 +1191,13 @@ msgid "Reset back to default"
msgstr "Återställ till standardvärde"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Spara"
@@ -1287,31 +1323,43 @@ msgstr "Kunde inte skapa alias."
msgid "Options saved."
msgstr "Alternativ sparade."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "E-postinställningar"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Hantera hur du får e-post från %%site.name%%"
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adress"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-postadress"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Aktuell, bekräftad e-postadress."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Ta bort"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1319,107 +1367,141 @@ msgstr ""
"Väntar bekräftelse av denna adress. Kontrollera din inkorg (och "
"skräppostkorg!) efter ett meddelande med vidare instruktioner."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-postadress"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "E-postadress, såsom \"användarnamn@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Lägg till"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkommande e-post"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Skicka e-post till denna adress för att posta nya notiser."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Ange en ny e-postadress för att posta till; detta inaktiverar den gamla."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Inställningar"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Skicka mig e-post när någon lägger till min notis som en favorit."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Jag vill posta notiser genom min e-post."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Publicera ett MicroID för min e-postadress."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Inställningar sparade."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Utseendeinställningar sparade."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Ingen e-postadress."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Det är redan din e-postadress."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Den e-postadressen tillhör redan en annan användare."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunde inte infoga bekräftelsekod."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1428,43 +1510,56 @@ msgstr ""
"din inkorg (och skräppostkorg!) för koden och instruktioner hur du använder "
"den."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen väntande bekräftelse att avbryta."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Detta är fel IM-adress."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Bekräftelse avbruten."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Det är inte din e-postadress."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Adressen togs bort."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen inkommande e-postadress."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kunde inte uppdatera användaruppgift."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkommande e-postadress borttagen."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny inkommande e-postadress tillagd."
@@ -1655,15 +1750,17 @@ msgstr ""
"\"? De kommer bli borttagna från gruppen, inte kunna skriva till och inte "
"kunna prenumerera på gruppen i framtiden."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Blockera inte denna användare från denna grupp"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Blockera denna användare från denna grupp"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Databasfel vid blockering av användare från grupp."
@@ -1846,11 +1943,15 @@ msgstr "Användare är inte blockerad från grupp."
msgid "Error removing the block."
msgstr "Fel vid hävning av blockering."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Inställningar för snabbmeddelanden"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1859,15 +1960,24 @@ msgstr ""
"Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%"
"doc.im%%). Konfigurera din adress och dina inställningar nedan."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM är inte tillgänglig."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adress för snabbmeddelanden"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1876,11 +1986,9 @@ msgstr ""
"Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto "
"för vidare instruktioner. (La du till %s i din kompislista?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adress för snabbmeddelanden"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1889,45 +1997,67 @@ msgstr ""
"Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först till "
"att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Inställningar"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Skicka notiser till mig genom Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Posta en notis när min Jabber/GTalk-status ändras."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Skicka svar till mig genom Jabber/GTalk från personer som jag inte "
"prenumererar på."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Inställningar sparade."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Inget Jabber-ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Kan inte normalisera detta Jabber-ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Inte ett giltigt Jabber-ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Detta är redan ditt Jabber-ID"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber-ID:t tillhör redan en annan användare."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1936,10 +2066,35 @@ msgstr ""
"En bekräftelsekod skickades till den IM-adress du angav. Du måste godkänna "
"att %s får skicka meddelanden till dig."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Detta är fel IM-adress."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kunde inte ta bort e-postbekräftelse."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bekräftelse avbruten."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Detta är inte ditt Jabber-ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adressen togs bort."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1981,7 +2136,9 @@ msgstr "Bjud in nya användare"
msgid "You are already subscribed to these users:"
msgstr "Du prenumererar redan på dessa användare:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2106,7 +2263,9 @@ msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
msgid "No nickname or ID."
msgstr "Inget smeknamn eller ID."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s gick med i grupp %2$s"
@@ -2115,11 +2274,13 @@ msgstr "%1$s gick med i grupp %2$s"
msgid "You must be logged in to leave a group."
msgstr "Du måste vara inloggad för att lämna en grupp."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Du är inte en medlem i den gruppen."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
@@ -2228,12 +2389,12 @@ msgstr "Använd detta formulär för att skapa en ny grupp."
msgid "New message"
msgstr "Nytt meddelande"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Du kan inte skicka ett meddelande till den användaren."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Inget innehåll!"
@@ -2241,7 +2402,7 @@ msgstr "Inget innehåll!"
msgid "No recipient specified."
msgstr "Ingen mottagare angiven."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2499,7 +2660,7 @@ msgid "6 or more characters"
msgstr "Minst 6 tecken"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Bekräfta"
@@ -3890,44 +4051,74 @@ msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
msgid "Save site notice"
msgstr "Spara webbplatsnotis"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Inställningar för SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "SMS är inte tillgängligt."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adress för snabbmeddelanden"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Nuvarande bekäftat telefonnummer för SMS."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Väntar bekräftelse för detta telefonnummer."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Bekräftelsekod"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Fyll i koden du mottog i din telefon."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Telefonnummer för SMS"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Inställningar"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3935,23 +4126,34 @@ msgstr ""
"Skicka notiser till mig via SMS. Jag är införstådd med att min operatör kan "
"debitera mig."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Inställningar sparade."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Inget telefonnummer."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Ingen operatör vald."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Detta är redan ditt telefonnummer."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Detta telefonnumr tillhör redan en annan användare."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3959,23 +4161,42 @@ msgstr ""
"En bekräftelsekod skickades till det telefonnummer du lagt till. Kontrollera "
"din telefon för koden och instruktioner om hur du använder den."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Detta är fel bekräftelsenummer."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bekräftelse avbruten."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Detta är inte ditt telefonnummer."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefonnummer för SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Mobiloperatör"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Välj en operatör"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3985,7 +4206,8 @@ msgstr ""
"SMS via e-post men som inte finns med i listan, skicka ett e-post till oss "
"på %s och berätta."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Ingen kod ifylld"
@@ -4012,7 +4234,6 @@ msgid "Invalid snapshot report URL."
msgstr "Ogiltig rapport-URL för ögonblicksbild"
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Slumpmässigt vid webbförfrågningar"
@@ -4601,7 +4822,7 @@ msgstr "Kunde inte uppdatera meddelande med ny URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
@@ -5182,34 +5403,29 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Avbryt"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Läs och skriv"
+msgstr "läs och skriv"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Skrivskyddad"
+msgstr "skrivskyddad"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Godkänd %1$s - \"%2$s\" åtkomst."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Återkalla"
@@ -5261,34 +5477,40 @@ msgstr "Kommando misslyckades"
msgid "Notice with that id does not exist"
msgstr "Notis med den ID:n finns inte"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Användare har ingen sista notis"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kunde inte hitta en användare med smeknamnet %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Kunde inte hitta en lokal användare med smeknamnet %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Tyvärr, detta kommando är inte implementerat än."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Knuff skickad till %s"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5299,57 +5521,55 @@ msgstr ""
"Prenumeranter: %2$s\n"
"Notiser: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Notis markerad som favorit."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Du är redan en medlem i denna grupp"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Kunde inte ansluta användare %s till groupp %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s gick med i grupp %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Kunde inte ta bort användare %s från grupp %s"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s lämnade grupp %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Fullständigt namn: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Om: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5358,139 +5578,145 @@ msgstr ""
"%s är en fjärrprofil; du kan bara skicka direktmeddelanden till användare på "
"samma server."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Direktmeddelande till %s skickat"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Fel vid sändning av direktmeddelande."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Kan inte upprepa din egen notis"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Redan upprepat denna notis"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Notis fron %s upprepad"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Fel vid upprepning av notis."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Notis för långt - maximum är %d tecken, du skickade %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Svar på %s skickat"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Fel vid sparande av notis."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Ange namnet på användaren att prenumerara på"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Kan inte prenumera på OMB-profiler via kommando."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Prenumerar på %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Ange namnet på användaren att avsluta prenumeration på"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Prenumeration hos %s avslutad"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Kommando inte implementerat än."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Notifikation av."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Kan inte sätta på notifikation."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Notifikation på."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Kan inte stänga av notifikation."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Inloggningskommando är inaktiverat"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Prenumeration avslutad %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar på denna person:"
msgstr[1] "Du prenumererar på dessa personer:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Denna person prenumererar på dig:"
msgstr[1] "Dessa personer prenumererar på dig:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Du är inte medlem i några grupper."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du är en medlem i denna grupp:"
msgstr[1] "Du är en medlem i dessa grupper:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6457,6 +6683,10 @@ msgid "Repeat this notice?"
msgstr "Upprepa denna notis?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Upprepa denna notis"
@@ -6642,47 +6872,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Moderator"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 1934cb51a..bf599e41b 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:22+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:49+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "మూసివేయబడింది"
msgid "Save access settings"
msgstr "అందుబాటు అమరికలను భద్రపరచు"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "భద్రపరచు"
@@ -103,7 +108,7 @@ msgstr "అటువంటి పేజీ లేదు."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "అటువంటి వాడుకరి లేరు."
@@ -336,7 +341,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
@@ -454,7 +459,7 @@ msgstr "గుంపు దొరకలేదు."
msgid "You are already a member of that group."
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు."
@@ -506,17 +511,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -549,12 +554,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -811,27 +819,44 @@ msgstr ""
"మీరు ఈ వాడుకరిని నిజంగానే నిరోధించాలనుకుంటున్నారా? ఆ తర్వాత, వారు మీ నుండి చందా విరమింపబడతారు, "
"భవిష్యత్తులో మీకు చందా చేరలేరు, మరియు వారి నుండి @-స్పందనలని మీకు తెలియజేయము."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "కాదు"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ఈ వాడుకరిని నిరోధించకు"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "అవును"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
@@ -844,8 +869,8 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "అటువంటి గుంపు లేదు."
@@ -906,16 +931,24 @@ msgstr "గుర్తుతెలియని చిరునామా రక
msgid "That address has already been confirmed."
msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
@@ -969,11 +1002,13 @@ msgstr ""
"మీరు నిజంగానే ఈ ఉపకరణాన్ని తొలగించాలనుకుంటున్నారా? ఇది ఆ ఉపకరణం గురించి భోగట్టాని, ప్రస్తుత "
"వాడుకరుల అనుసంధానాలతో సహా, డాటాబేసు నుండి తొలగిస్తుంది."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "ఈ ఉపకరణాన్ని తొలగించు"
@@ -1006,11 +1041,13 @@ msgstr "నోటీసుని తొలగించు"
msgid "Are you sure you want to delete this notice?"
msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "ఈ నోటీసుని తొలగించకు"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "ఈ నోటీసుని తొలగించు"
@@ -1034,7 +1071,8 @@ msgstr ""
"మీరు నిజంగానే ఈ వాడుకరిని తొలగించాలనుకుంటున్నారా? ఇది ఆ వాడుకరి భోగట్టాని డాటాబేసు నుండి తొలగిస్తుంది, "
"వెనక్కి తేలేకుండా."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "ఈ వాడుకరిని తొలగించు"
@@ -1145,15 +1183,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "భద్రపరచు"
@@ -1281,31 +1317,43 @@ msgstr "మారుపేర్లని సృష్టించలేకప
msgid "Options saved."
msgstr "ఎంపికలు భద్రమయ్యాయి."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "ఈమెయిల్ అమరికలు"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "చిరునామా"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ఈమెయిలు చిరునామా"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "తొలగించు"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1313,148 +1361,196 @@ msgstr ""
"ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) "
"చూడండి."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "రద్దుచేయి"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ఈమెయిలు చిరునామా"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "చేర్చు"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "కొత్తది"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "అభిరుచులు"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "అభిరుచులు భద్రమయ్యాయి."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "ఈమెయిలు చిరునామా లేదు."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "ఆ IM చిరునామా సరైనది కాదు."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "నిర్ధారణ రద్దయింది."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "ఆ చిరునామాని తొలగించాం."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1640,15 +1736,17 @@ msgstr ""
"నిజంగానే వాడుకరి \"%1$s\"ని \"%2$s\" గుంపు నుండి నిరోధించాలనుకుంటున్నారా? వారిని గుంపు నుండి "
"తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1827,90 +1925,148 @@ msgstr "వాడుకరిని గుంపు నుండి నిరో
msgid "Error removing the block."
msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "IM అమరికలు"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "IM అందుబాటులో లేదు."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM చిరునామా"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM చిరునామా"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "అభిరుచులు"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "అభిరుచులు భద్రమయ్యాయి."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Jabber ID లేదు."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr ""
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "సరైన Jabber ఐడీ కాదు"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ఆ IM చిరునామా సరైనది కాదు."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "నిర్ధారణ రద్దయింది."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "ఇది మీ Jabber ID కాదు"
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ఆ చిరునామాని తొలగించాం."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1951,7 +2107,9 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం
msgid "You are already subscribed to these users:"
msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2045,7 +2203,9 @@ msgstr "గుంపుల్లో చేరడానికి మీరు ప
msgid "No nickname or ID."
msgstr "పేరు లేదు."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s %2$s గుంపులో చేరారు"
@@ -2054,11 +2214,13 @@ msgstr "%1$s %2$s గుంపులో చేరారు"
msgid "You must be logged in to leave a group."
msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
@@ -2168,12 +2330,12 @@ msgstr "కొత్త గుంపుని సృష్టిండాని
msgid "New message"
msgstr "కొత్త సందేశం"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "విషయం లేదు!"
@@ -2181,7 +2343,7 @@ msgstr "విషయం లేదు!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
@@ -2439,7 +2601,7 @@ msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "నిర్థారించు"
@@ -3785,97 +3947,158 @@ msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అ
msgid "Save site notice"
msgstr "సైటు గమనికని భద్రపరచు"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "SMS అమరికలు"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM చిరునామా"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "నిర్ధారణ సంకేతం"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "నిర్థారించు"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "అభిరుచులు"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "అభిరుచులు భద్రమయ్యాయి."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "ఫోను నెంబరు లేదు."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబరు."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "ఆ ఫోను నంబరు ఇప్పటికే వేరే వాడుకరికి చెందినది."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "నిర్ధారణ రద్దయింది."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "అది మీ ఫోను నంబర్ కాదు."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "ఆ చిరునామాని తొలగించాం."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5052,10 +5275,8 @@ msgstr "చదవడం-వ్రాయడం"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "రద్దుచేయి"
@@ -5135,35 +5356,41 @@ msgstr "ఆదేశం విఫలమైంది"
msgid "Notice with that id does not exist"
msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "%sకి స్పందనలు"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5174,197 +5401,201 @@ msgstr ""
"చందాదార్లు: %2$s\n"
"నోటీసులు: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు"
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s %s గుంపులో చేరారు"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "పూర్తిపేరు: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "ప్రాంతం: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "హోంపేజీ: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "గురించి: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "%sకి నేరు సందేశాన్ని పంపించాం"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "మీ నోటిసుని మీరే పునరావృతించలేరు"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "ఇప్పటికే ఈ నోటీసుని పునరావృతించారు"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "సందేశాలు"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "%sకి స్పందనలు"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "%sకి చందా చేరారు"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s నుండి చందా విరమించారు"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "%s నుండి చందా విరమించారు"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "మీరు ఎవరికీ చందాచేరలేదు."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6228,6 +6459,10 @@ msgid "Repeat this notice?"
msgstr "ఈ నోటీసుని పునరావృతించాలా?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "అవును"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "ఈ నోటీసుని పునరావృతించు"
@@ -6418,47 +6653,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "సమన్వయకర్త"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index d52d304de..e5b1c00ff 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:52+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Böyle bir kullanıcı yok."
msgid "Save access settings"
msgstr "Ayarlar"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -111,7 +116,7 @@ msgstr "Böyle bir durum mesajı yok."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
@@ -348,7 +353,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr "Bu zaten sizin Jabber ID'niz."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -472,7 +477,7 @@ msgstr "İstek bulunamadı!"
msgid "You are already a member of that group."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -525,17 +530,17 @@ msgid "Invalid token."
msgstr "Geçersiz büyüklük."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Beklenmeğen form girdisi."
@@ -840,29 +848,45 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
-msgstr ""
+msgstr "Durum mesajları"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -875,8 +899,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "Böyle bir durum mesajı yok."
@@ -938,16 +962,24 @@ msgstr "Tanınmayan adres türü %s"
msgid "That address has already been confirmed."
msgstr "O adres daha önce onaylanmış."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Kullanıcı güncellenemedi."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Eposta onayı silinemedi."
@@ -1005,12 +1037,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
@@ -1044,12 +1078,14 @@ msgstr ""
msgid "Are you sure you want to delete this notice?"
msgstr ""
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr ""
@@ -1073,7 +1109,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Böyle bir kullanıcı yok."
@@ -1195,15 +1232,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Kaydet"
@@ -1340,180 +1375,239 @@ msgstr "Avatar bilgisi kaydedilemedi"
msgid "Options saved."
msgstr "Ayarlar kaydedildi."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Profil ayarları"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Eposta adresi onayı"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr ""
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Kaldır"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "İptal et"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Eposta adresi onayı"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Ekle"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
msgid "New"
msgstr ""
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Tercihler"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Tercihler kaydedildi."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Onay kodu eklenemedi."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "İptal etmek için beklenen onay yok."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Yanlış IM adresi."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Onaylama iptal edildi."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Bu adres kaldırılmıştı."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1711,17 +1805,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "Böyle bir kullanıcı yok."
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1902,12 +1998,16 @@ msgstr "Kullanıcının profili yok."
msgid "Error removing the block."
msgstr "Kullanıcıyı kaydetmede hata oluştu."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "IM Ayarları"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1916,16 +2016,26 @@ msgstr ""
"Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
"ayarlarinizi aşağıda yapın."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM adresi"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Onaylanmış Jabber/Gtalk adresi."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1934,12 +2044,9 @@ msgstr ""
"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
"içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresi"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1948,44 +2055,66 @@ msgstr ""
"Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Öncelikle %s, "
"IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Tercihler"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
"Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "JabberID yok."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Jabber işlemlerinde bir hata oluştu."
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Geçersiz bir Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Bu zaten sizin Jabber ID'niz."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID başka bir kullanıcıya ait."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1994,10 +2123,35 @@ msgstr ""
"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
"mesaj yollanabilmesi için onaylamanız gerekmektedir."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Yanlış IM adresi."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Eposta onayı silinemedi."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Onaylama iptal edildi."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Bu sizin Jabber ID'niz değil."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Bu adres kaldırılmıştı."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2038,7 +2192,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2133,7 +2289,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "Takma ad yok"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2142,12 +2300,14 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "Bize o profili yollamadınız"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -2262,12 +2422,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "İçerik yok!"
@@ -2275,7 +2435,7 @@ msgstr "İçerik yok!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2536,7 +2696,7 @@ msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Onayla"
@@ -3893,98 +4053,159 @@ msgstr ""
msgid "Save site notice"
msgstr "Yeni durum mesajı"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "IM Ayarları"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM adresi"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Onayla"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Tercihler"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr "O onay kodu sizin için değil!"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Onaylama iptal edildi."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Bu adres kaldırılmıştı."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5208,10 +5429,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "İptal et"
@@ -5288,35 +5507,41 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "Kullanıcının profili yok."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kullanıcı güncellenemedi."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Kullanıcı güncellenemedi."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "%s için cevaplar"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5324,201 +5549,205 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "OpenID formu yaratılamadı: %s"
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tam İsim"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Durum mesajları"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "%s için cevaplar"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Aboneliği sonlandır"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6379,6 +6608,10 @@ msgid "Repeat this notice?"
msgstr "Böyle bir durum mesajı yok."
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Böyle bir durum mesajı yok."
@@ -6575,47 +6808,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 6df541697..f9b74e02d 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:29+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:55+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Закрито"
msgid "Save access settings"
msgstr "Зберегти параметри доступу"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr "Зберегти"
@@ -108,7 +113,7 @@ msgstr "Немає такої сторінки."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Такого користувача немає."
@@ -347,7 +352,7 @@ msgstr "Жодних статусів з таким ID."
msgid "This status is already a favorite."
msgstr "Цей статус вже є обраним."
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Не можна позначити як обране."
@@ -465,7 +470,7 @@ msgstr "Групу не знайдено."
msgid "You are already a member of that group."
msgstr "Ви вже є учасником цієї групи."
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr "Адмін цієї групи заблокував Вашу присутність в ній."
@@ -516,17 +521,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr "Токен запиту %s було скасовано і відхилено."
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Несподіване представлення форми."
@@ -826,27 +834,44 @@ msgstr ""
"відписано від Вас, він не зможе підписитасть до Вас у майбутньому і Ви "
"більше не отримуватимете жодних дописів від нього."
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Ні"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не блокувати цього користувача"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Так"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати користувача"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
@@ -859,8 +884,8 @@ msgstr "Збереження інформації про блокування з
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "Такої групи немає."
@@ -919,16 +944,24 @@ msgstr "Невизначений тип адреси %s."
msgid "That address has already been confirmed."
msgstr "Цю адресу вже було підтверджено."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Не вдалося оновити користувача."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не вдалося видалити підтвердження поштової адреси."
@@ -983,11 +1016,13 @@ msgstr ""
"інформацію стосовно нього, включно із даними про під’єднаних до цього "
"додатку користувачів."
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
msgid "Do not delete this application"
msgstr "Не видаляти додаток"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
msgid "Delete this application"
msgstr "Видалити додаток"
@@ -1020,11 +1055,13 @@ msgstr "Видалити допис"
msgid "Are you sure you want to delete this notice?"
msgstr "Ви впевненні, що бажаєте видалити цей допис?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
msgid "Do not delete this notice"
msgstr "Не видаляти цей допис"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr "Видалити допис"
@@ -1048,7 +1085,8 @@ msgstr ""
"Впевнені, що бажаєте видалити цього користувача? Усі дані буде знищено без "
"можливості відновлення."
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
msgid "Delete this user"
msgstr "Видалити цього користувача"
@@ -1161,15 +1199,13 @@ msgid "Reset back to default"
msgstr "Повернутись до початкових налаштувань"
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Зберегти"
@@ -1295,31 +1331,43 @@ msgstr "Неможна призначити додаткові імена."
msgid "Options saved."
msgstr "Опції збережено."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
msgid "Email settings"
msgstr "Налаштування пошти"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Зазначте, як саме Ви бажаєте отримувати листи з %%site.name%%."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Адреса"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Електронна адреса"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Поточна підтверджена поштова адреса."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Видалити"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1327,106 +1375,141 @@ msgstr ""
"Очікування підтвердження цієї адреси. Перевірте вхідну пошту (і теку зі "
"спамом також!), там має бути повідомлення з подальшими інструкціями."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Скасувати"
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Електронна адреса"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "Електронна адреса, на зразок \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Додати"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Вхідна пошта"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Нове"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Преференції"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Поівдомляти мене поштою про нові підписки."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Надсилати мені листа, коли на мій допис з’являється \"@-відповідь\"."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Я хочу надсилати дописи поштою."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Позначати міткою MicroID мою електронну адресу."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Преференції збережно."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Преференції дизайну збережно."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Немає електронної адреси."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійсна електронна адреса."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "Це і є Вашою адресою."
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "Ця електронна адреса належить іншому користувачу."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не вдалося додати код підтвердження."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1435,43 +1518,56 @@ msgstr ""
"Перевірте вхідну пошту (і теку зі спамом також!), там має бути код та "
"подальші інструкції."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Не очікується підтвердження для скасування."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Це помилкова адреса IM."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Підтвердження скасовано."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "Це не є Вашою адресою."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Адресу було видалено."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Немає адреси для вхідної пошти."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не вдалося оновити запис користувача."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Адресу вхідної пошти видалено."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Нову адресу для вхідних повідомлень додано."
@@ -1660,15 +1756,17 @@ msgstr ""
"позбавлено членства в групі, він не зможе сюди писати, і не зможе вступити "
"до групи знов."
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
msgid "Do not block this user from this group"
msgstr "Не блокувати користувача в групі"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
msgid "Block this user from this group"
msgstr "Блокувати користувача цієї групи"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr "Виникла помилка при блокуванні користувача в цій групі."
@@ -1852,11 +1950,15 @@ msgstr "Користувача не блоковано."
msgid "Error removing the block."
msgstr "Помилка при розблокуванні."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
msgid "IM settings"
msgstr "Налаштування ІМ"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1865,15 +1967,24 @@ msgstr ""
"Ви можете надсилати та отримувати дописи через Jabber/GTalk [службу миттєвих "
"повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
msgid "IM is not available."
msgstr "ІМ недоступний"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "ІМ-адреса"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Поточна підтверджена адреса Jabber/GTalk."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1883,11 +1994,9 @@ msgstr ""
"туди має надійти повідомлення з подальшими інструкціями. (Ви додали %s до "
"Вашого списку контактів?)"
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "ІМ-адреса"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1897,45 +2006,67 @@ msgstr ""
"переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
"GTalk."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Преференції"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Повідомляти мене через Jabber/GTalk."
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Надсилати дописи на сайт, коли мій статус Jabber/GTalk змінюється."
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Надсилати також мені відповіді через Jabber/GTalk від людей, до яких я не "
"підписаний."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Преференції збережно."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Немає Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Не можна полагодити цей Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Це недійсний Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Це і є Ваш Jabber ID."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID вже належить іншому користувачу."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -1944,10 +2075,35 @@ msgstr ""
"Код підтвердження був відправлений на адресу IM, яку Ви додали. Ви повинні "
"затведити %s для відправлення вам повідомлень."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Це помилкова адреса IM."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Не вдалося видалити підтвердження поштової адреси."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Підтвердження скасовано."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Це не Ваш Jabber ID."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Адресу було видалено."
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -1989,7 +2145,9 @@ msgstr "Запросити нових користувачів"
msgid "You are already subscribed to these users:"
msgstr "Ви вже підписані до цих користувачів:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2114,7 +2272,9 @@ msgstr "Ви повинні спочатку увійти на сайт, аби
msgid "No nickname or ID."
msgstr "Немає імені або ІД."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s приєднався до групи %2$s"
@@ -2123,11 +2283,13 @@ msgstr "%1$s приєднався до групи %2$s"
msgid "You must be logged in to leave a group."
msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу."
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr "Ви не є учасником цієї групи."
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
@@ -2239,12 +2401,12 @@ msgstr "Скористайтесь цією формою для створенн
msgid "New message"
msgstr "Нове повідомлення"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Немає змісту!"
@@ -2252,7 +2414,7 @@ msgstr "Немає змісту!"
msgid "No recipient specified."
msgstr "Жодного отримувача не визначено."
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2511,7 +2673,7 @@ msgid "6 or more characters"
msgstr "6 або більше знаків"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Підтвердити"
@@ -3901,44 +4063,74 @@ msgstr "Текст повідомлення сайту (255 символів м
msgid "Save site notice"
msgstr "Зберегти повідомлення сайту"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
msgid "SMS settings"
msgstr "Налаштування СМС"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Ви можете отримувати СМС через електронну пошту від %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
msgid "SMS is not available."
msgstr "СМС недоступно."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ІМ-адреса"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "Поточний підтверджений телефонний номер."
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "Очікування підтвердження телефонного номера."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "Код підтвердження"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Введіть код, який Ви отримали телефоном."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr "Телефонний номер"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Преференції"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -3946,23 +4138,34 @@ msgstr ""
"Повідомляти мене за допомогою СМС; Я розімію, що, можливо, понесу надмірні "
"витрати від мого мобільного оператора."
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Преференції збережно."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Немає телефонного номера."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "Оператора не обрано."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "Це і є Ваш телефонний номер."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Цей телефонний номер належить іншому користувачу."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
@@ -3970,23 +4173,42 @@ msgstr ""
"Код підтвердження був відправлений на телефонний номер, який Ви додали. "
"Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "Це помилковий код підтвердження."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Підтвердження скасовано."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Це не Ваш телефонний номер."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Телефонний номер"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr "Мобільний оператор"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Оберіть оператора"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3996,7 +4218,8 @@ msgstr ""
"надсилання СМС через електронну пошту, але він тут не вказаний, напишіть нам "
"і ми внесемо його до списку."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Код не введено"
@@ -5192,10 +5415,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати"
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Скасувати"
@@ -5271,34 +5492,40 @@ msgstr "Команду не виконано"
msgid "Notice with that id does not exist"
msgstr "Такого допису не існує"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "Користувач не має останнього допису"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Не вдалося знайти користувача з іменем %s"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Не вдалося знайти локального користувача з іменем %s"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "Даруйте, але виконання команди ще не завершено."
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!"
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr "Спробу «розштовхати» %s зараховано"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5309,57 +5536,55 @@ msgstr ""
"Підписчики: %2$s\n"
"Дописи: %3$s"
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "Допис позначено як обраний."
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "Ви вже є учасником цієї групи."
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. 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.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
msgstr "Не вдалось долучити користувача %1$s до групи %2$s."
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%1$s приєднався до групи %2$s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
msgstr "Не вдалося видалити користувача %1$s з групи %2$s."
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s залишив групу %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "Повне ім’я: %s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "Розташування: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "Веб-сторінка: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "Про мене: %s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5368,142 +5593,149 @@ msgstr ""
"%s — це віддалений профіль; Ви можете надсилати приватні повідомлення лише "
"користувачам одного з вами сервісу."
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Повідомлення надто довге — максимум %1$d символів, а Ви надсилаєте %2$d."
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "Пряме повідомлення для %s надіслано."
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "Помилка при відправці прямого повідомлення."
-#: lib/command.php:490
+#: lib/command.php:514
msgid "Cannot repeat your own notice"
msgstr "Не можу повторити Ваш власний допис"
-#: lib/command.php:495
+#: lib/command.php:519
msgid "Already repeated that notice"
msgstr "Цей допис вже повторили"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, php-format
msgid "Notice from %s repeated"
msgstr "Допис %s повторили"
-#: lib/command.php:505
+#: lib/command.php:531
msgid "Error repeating notice."
msgstr "Помилка при повторенні допису."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d"
-#: lib/command.php:545
+#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
msgstr "Відповідь до %s надіслано"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "Проблема при збереженні допису."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись"
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr "Не можу підписатись до профілю OMB за командою."
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "Підписано до %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "Відписано від %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "Виконання команди ще не завершено."
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "Сповіщення вимкнуто."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "Не можна вимкнути сповіщення."
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "Сповіщення увімкнуто."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr "Команду входу відключено"
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s"
-#: lib/command.php:735
+#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
msgstr "Відписано %s"
-#: lib/command.php:752
+#: lib/command.php:778
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ви підписані до цієї особи:"
msgstr[1] "Ви підписані до цих людей:"
msgstr[2] "Ви підписані до цих людей:"
-#: lib/command.php:774
+#: lib/command.php:800
msgid "No one is subscribed to you."
msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ця особа є підписаною до Вас:"
msgstr[1] "Ці люди підписані до Вас:"
msgstr[2] "Ці люди підписані до Вас:"
-#: lib/command.php:796
+#: lib/command.php:822
msgid "You are not a member of any groups."
msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ви є учасником групи:"
msgstr[1] "Ви є учасником таких груп:"
msgstr[2] "Ви є учасником таких груп:"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6470,6 +6702,10 @@ msgid "Repeat this notice?"
msgstr "Повторити цей допис?"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Так"
+
+#: lib/repeatform.php:132
msgid "Repeat this notice"
msgstr "Повторити цей допис"
@@ -6655,47 +6891,57 @@ msgctxt "role"
msgid "Moderator"
msgstr "Модератор"
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index a36036300..841894503 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:32+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:58+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Ban user"
msgid "Save access settings"
msgstr "Thay đổi hình đại diện"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -110,7 +115,7 @@ msgstr "Không có tin nhắn nào."
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Không có user nào."
@@ -349,7 +354,7 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
msgid "This status is already a favorite."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "Không thể tạo favorite."
@@ -474,7 +479,7 @@ msgstr "Phương thức API không tìm thấy!"
msgid "You are already a member of that group."
msgstr "Bạn đã theo những người này:"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -527,17 +532,17 @@ msgid "Invalid token."
msgstr "Kích thước không hợp lệ."
#: 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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -571,12 +576,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "Bất ngờ gửi mẫu thông tin. "
@@ -844,29 +852,46 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "Không"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bỏ chặn người dùng này"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "Có"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -879,8 +904,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "Không có tin nhắn nào."
@@ -941,16 +966,24 @@ msgstr "Không nhận dạng kiểu địa chỉ %s"
msgid "That address has already been confirmed."
msgstr "Địa chỉ đó đã được xác nhận rồi."
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Không thể cập nhật thành viên."
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Không thể xóa email xác nhận."
@@ -1009,12 +1042,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "Xóa tin nhắn"
@@ -1049,12 +1084,14 @@ msgstr "Xóa tin nhắn"
msgid "Are you sure you want to delete this notice?"
msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -1080,7 +1117,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "Xóa tin nhắn"
@@ -1206,15 +1244,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "Lưu"
@@ -1358,32 +1394,45 @@ msgstr "Không thể tạo favorite."
msgid "Options saved."
msgstr "Đã lưu các điều chỉnh."
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "Thiết lập địa chỉ email"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "Bạn nhận email từ %%site.name%% như thế nào."
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Địa chỉ"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Địa chỉ email"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "Đã xác nhận địa chỉ này."
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "Xóa"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1391,114 +1440,148 @@ msgstr ""
"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) "
"để nhận tin nhắn và lời hướng dẫn."
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "Hủy"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Địa chỉ email"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
#, fuzzy
msgid "Email address, like \"UserName@example.org\""
msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "Thêm"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "Mới"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "Tính năng"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới."
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
"thích của họ."
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "Tôi muốn đưa tin nhắn lên bằng email."
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
msgstr "Các tính năng đã được lưu."
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "Không có địa chỉ email."
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa địa chỉ GTalk này"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Địa chỉ email không hợp lệ."
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
#, fuzzy
msgid "That is already your email address."
msgstr "Bạn đã dùng địa chỉ email này rồi"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
#, fuzzy
msgid "That email address already belongs to another user."
msgstr "Địa chỉ email GTalk này đã có người khác sử dụng rồi."
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Không thể chèn mã xác nhận."
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1506,47 +1589,60 @@ msgstr ""
"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
"làm theo hướng dẫn."
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Sự xác nhận chưa được hủy bỏ."
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "Sai IM."
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "Sự xác nhận đã bị hủy bỏ."
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
#, fuzzy
msgid "That is not your email address."
msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "Đã xóa địa chỉ."
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
#, fuzzy
msgid "No incoming email address."
msgstr "Địa chỉ email không hợp lệ."
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
#, fuzzy
msgid "Couldn't update user record."
msgstr "Không thể cập nhật thành viên."
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
#, fuzzy
msgid "Incoming email address removed."
msgstr "Địa chỉ email hoặc mật khẩu không đúng."
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
#, fuzzy
msgid "New incoming email address added."
msgstr "Đã xác nhận địa chỉ này."
@@ -1750,17 +1846,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "Ban user"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1946,12 +2044,16 @@ msgstr "Người dùng không có thông tin."
msgid "Error removing the block."
msgstr "Lỗi xảy ra khi lưu thành viên."
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "Cấu hình IM"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1960,16 +2062,26 @@ msgstr ""
"Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk [tin nhắn nhanh]"
"(%%doc.im%%). Định dạng địa chỉ của bạn và các thiết lập sau."
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "Địa chỉ Jabber/GTalk vừa được xác nhận."
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1978,12 +2090,9 @@ msgstr ""
"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài khoản Jabber/GTalk để "
"nhận tin nhắn và lời hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1992,45 +2101,67 @@ msgstr ""
"Địa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". Đầu tiên, hãy "
"tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Tính năng"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk "
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
"Gửi những tin nhắn trả lời của tôi từ những người mà tôi không theo qua "
"Jabber/GTalk."
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Các tính năng đã được lưu."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "Không có Jabber ID."
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "Không thể bình thường hóa Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "Jabber ID không hợp lệ"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID này đã thuộc về người khác rồi."
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -2039,10 +2170,35 @@ msgstr ""
"Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải chấp nhận %s để có thể gửi "
"tin nhắn đến bạn."
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Sai IM."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Không thể xóa email xác nhận."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Sự xác nhận đã bị hủy bỏ."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "Đây không phải Jabber ID của bạn."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Đã xóa địa chỉ."
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2083,7 +2239,9 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản"
msgid "You are already subscribed to these users:"
msgstr "Bạn đã theo những người này:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, fuzzy, php-format
msgid "%1$s (%2$s)"
msgstr "%s (%s)"
@@ -2212,7 +2370,9 @@ msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những
msgid "No nickname or ID."
msgstr "Không có biệt hiệu."
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s và nhóm"
@@ -2222,12 +2382,14 @@ msgstr "%s và nhóm"
msgid "You must be logged in to leave a group."
msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
@@ -2344,13 +2506,13 @@ msgstr ""
msgid "New message"
msgstr "Tin mới nhất"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
#, fuzzy
msgid "You can't send a message to this user."
msgstr "Bạn đã theo những người này:"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "Không có nội dung!"
@@ -2358,7 +2520,7 @@ msgstr "Không có nội dung!"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2627,7 +2789,7 @@ msgid "6 or more characters"
msgstr "Nhiều hơn 6 ký tự"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "Xác nhận"
@@ -4017,49 +4179,79 @@ msgstr ""
msgid "Save site notice"
msgstr "Thông báo mới"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "Thiết lập SMS"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
#, fuzzy
msgid "Awaiting confirmation on this phone number."
msgstr "Đó không phải là số điện thoại của bạn."
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
#, fuzzy
msgid "Confirmation code"
msgstr "Không có mã số xác nhận."
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Xác nhận"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "Số điện thoại để nhắn SMS "
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự "
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Tính năng"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
@@ -4067,26 +4259,37 @@ msgstr ""
"Hãy gửi thông báo đến tôi qua SMS; Tôi biết là bạn đang phải trả giá cao "
"cho dịch vụ của chúng tôi. "
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Các tính năng đã được lưu."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Không có số điện thoại."
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
#, fuzzy
msgid "No carrier selected."
msgstr "Bạn chưa chọn hình để đưa lên."
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
#, fuzzy
msgid "That is already your phone number."
msgstr "Đó không phải là số điện thoại của bạn."
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
#, fuzzy
msgid "That phone number already belongs to another user."
msgstr "Địa chỉ email Yahoo này đã có người khác sử dụng rồi."
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -4095,25 +4298,44 @@ msgstr ""
"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
"làm theo hướng dẫn."
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
#, fuzzy
msgid "That is the wrong confirmation number."
msgstr "Đó không phải là số điện thoại của bạn."
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Sự xác nhận đã bị hủy bỏ."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "Đó không phải là số điện thoại của bạn."
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Số điện thoại để nhắn SMS "
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
#, fuzzy
msgid "Mobile carrier"
msgstr "Chọn nhà cung cấp Mobile"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "Chọn nhà cung cấp Mobile"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4123,7 +4345,8 @@ msgstr ""
"dịch vụ điện thoại nào cho phép nhận SMS qua email mà chưa có trong danh "
"sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s."
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "Không có mã nào được nhập"
@@ -5365,10 +5588,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "Hủy"
@@ -5448,35 +5669,41 @@ msgstr " và bạn bè"
msgid "Notice with that id does not exist"
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "Người dùng không có thông tin."
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "Tin đã gửi"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5484,205 +5711,209 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
#, fuzzy
msgid "Notice marked as fave."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "Bạn đã theo những người này:"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s và nhóm"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%s và nhóm"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tên đầy đủ"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, fuzzy, php-format
msgid "About: %s"
msgstr "Giới thiệu"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, fuzzy, php-format
msgid "Direct message to %s sent"
msgstr "Tin nhắn riêng"
-#: lib/command.php:470
+#: lib/command.php:494
#, fuzzy
msgid "Error sending direct message."
msgstr "Thư bạn đã gửi"
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "Xóa tin nhắn"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Tin đã gửi"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "Trả lời tin nhắn này"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:608
+#: lib/command.php:634
#, fuzzy, php-format
msgid "Subscribed to %s"
msgstr "Theo nhóm này"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, fuzzy, php-format
msgid "Unsubscribed from %s"
msgstr "Hết theo"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
#, fuzzy
msgid "Notification off."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
#, fuzzy
msgid "Notification on."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "Hết theo"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6611,6 +6842,10 @@ msgid "Repeat this notice?"
msgstr "Trả lời tin nhắn này"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Có"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "Trả lời tin nhắn này"
@@ -6816,47 +7051,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 0d374039a..d9b20ac14 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:35+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:45:01+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -80,8 +80,13 @@ msgstr "阻止"
msgid "Save access settings"
msgstr "头像设置"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -113,7 +118,7 @@ msgstr "没有该页面"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "没有这个用户。"
@@ -350,7 +355,7 @@ msgstr "没有找到此ID的信息。"
msgid "This status is already a favorite."
msgstr "已收藏此通告!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "无法创建收藏。"
@@ -473,7 +478,7 @@ msgstr "API 方法未实现!"
msgid "You are already a member of that group."
msgstr "您已经是该组成员"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -526,17 +531,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -570,12 +575,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
@@ -840,29 +848,46 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "否"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "取消阻止次用户"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "是"
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "保存阻止信息失败。"
@@ -875,8 +900,8 @@ msgstr "保存阻止信息失败。"
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "没有这个组。"
@@ -938,16 +963,24 @@ msgstr "不可识别的地址类型 %s"
msgid "That address has already been confirmed."
msgstr "此地址已被确认。"
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "无法更新用户。"
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
@@ -1006,12 +1039,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "无法删除通告。"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "删除通告"
@@ -1046,12 +1081,14 @@ msgstr "删除通告"
msgid "Are you sure you want to delete this notice?"
msgstr "确定要删除这条消息吗?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -1077,7 +1114,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "删除通告"
@@ -1199,15 +1237,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
@@ -1346,32 +1382,45 @@ msgstr "无法创建收藏。"
msgid "Options saved."
msgstr "选项已保存。"
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "电子邮件设置"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "设置 %%site.name%% 发送的邮件。"
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "地址"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "电子邮件地址"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "已确认的电子邮件。"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "移除"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1379,108 +1428,142 @@ msgstr ""
"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件,其中包含了进一步的"
"指示。"
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "取消"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "电子邮件地址"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件,类似 \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "添加"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "发布用的电子邮件"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "向这个电子邮件发信以发布新的通告。"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布信息;取消旧的。"
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "新建"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "首选项"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "如果有新订阅,通过电子邮件告诉我。"
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "如果有人收藏我的通告,发邮件通知我。"
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "如果收到私人信息,发邮件通知我。"
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "如果收到私人信息,发邮件通知我。"
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "允许朋友们呼叫并给我发送邮件。"
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "我希望通过邮件发布信息。"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "首选项已保存。"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "同步选项已保存。"
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "没有电子邮件地址。"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "您已登记此电子邮件。"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "无法插入验证码。"
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1488,43 +1571,56 @@ msgstr ""
"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱),找到验证码并按要求"
"使用它。"
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "即时通讯帐号错误。"
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "已取消确认。"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "这是他人的电子邮件。"
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "地址被移除。"
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被移除。"
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
@@ -1729,17 +1825,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "该组成员列表。"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "该组成员列表。"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1922,12 +2020,16 @@ msgstr "用户没有个人信息。"
msgid "Error removing the block."
msgstr "保存用户时出错。"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "IM 设置"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1936,16 +2038,26 @@ msgstr ""
"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
"们。"
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM 帐号"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "已确认的Jabber/GTalk帐号。"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1954,12 +2066,9 @@ msgstr ""
"正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。"
"(你是否已经添加 %s为你的好友?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM 帐号"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1968,53 +2077,100 @@ msgstr ""
"Jabber 或 GTalk 帐号,类似\"UserName@example.org\"。首先,必须在即时聊天工具"
"或GTalk中将 %s 加为好友。"
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "首选项"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "通过Jabber/GTalk发送通告。"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "如果我尚未订阅的用户回我消息,使用Jabber/GTalk通知我。"
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "公开Jabber/GTalk帐号的 MicroID。"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "首选项已保存。"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "没有 Jabber ID。"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "无法识别此Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "不是有效的 Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "您已登记此Jabber帐号。"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID 属于另一用户。"
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "即时通讯帐号错误。"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "无法删除电子邮件确认。"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "已取消确认。"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "这不是您的Jabber帐号。"
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "地址被移除。"
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2055,7 +2211,9 @@ msgstr "邀请新用户"
msgid "You are already subscribed to these users:"
msgstr "您已订阅这些用户:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2171,7 +2329,9 @@ msgstr "您必须登录才能加入组。"
msgid "No nickname or ID."
msgstr "没有昵称。"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s 加入 %s 组"
@@ -2181,12 +2341,14 @@ msgstr "%s 加入 %s 组"
msgid "You must be logged in to leave a group."
msgstr "您必须登录才能邀请其他人使用 %s"
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "您未告知此个人信息"
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
@@ -2299,12 +2461,12 @@ msgstr "使用此表格创建组。"
msgid "New message"
msgstr "新消息"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "无法向此用户发送消息。"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "没有内容!"
@@ -2312,7 +2474,7 @@ msgstr "没有内容!"
msgid "No recipient specified."
msgstr "没有收件人。"
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
@@ -2576,7 +2738,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "确认"
@@ -3956,69 +4118,110 @@ msgstr ""
msgid "Save site notice"
msgstr "新通告"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS短信设置"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM 帐号"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "已确认的可以发送SMS短消息的电话号码。"
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "等待确认此电话号码。"
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "确认码"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "输入手机收到的验证码。"
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "确认"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS短信电话号码"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "电话号码,不带标点或空格,包含地区代码"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "首选项"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr "通过SMS短信将通告发给我;我了解这样也许会给我带来不菲的开支。"
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "首选项已保存。"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "没有电话号码。"
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "未选择运营商。"
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "您已登记此电话号码。"
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "这个电话号码属于另一个用户。"
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -4027,24 +4230,43 @@ msgstr ""
"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱),找到验证码并按要求"
"使用它。"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "确认码错误。"
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "已取消确认。"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "这是他人的电话号码。"
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS短信电话号码"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
#, fuzzy
msgid "Mobile carrier"
msgstr "选择运营商"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "选择运营商"
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4053,7 +4275,8 @@ msgstr ""
"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信,而这里尚未列出,请联"
"系 %s 以告知。"
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "没有输入验证码"
@@ -5296,10 +5519,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "取消"
@@ -5377,34 +5598,40 @@ msgstr "执行失败"
msgid "Notice with that id does not exist"
msgstr "没有找到此ID的信息。"
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
msgstr "用户没有通告。"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "无法更新已确认的电子邮件。"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "无法更新已确认的电子邮件。"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr "对不起,这个命令还没有实现。"
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "振铃呼叫发出。"
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5412,200 +5639,204 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "通告被标记为收藏。"
-#: lib/command.php:317
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "您已经是该组成员"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "无法把 %s 用户添加到 %s 组"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s 加入 %s 组"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "无法订阅用户:未找到。"
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s 离开群 %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "全名:%s"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "位置:%s"
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "关于:%s"
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "发送消息出错。"
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "无法开启通告。"
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "删除通告"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "消息已发布。"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "保存通告时出错。"
-#: lib/command.php:536
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "无法删除通告。"
-#: lib/command.php:547
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "保存通告时出错。"
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "指定要订阅的用户名"
-#: lib/command.php:602
+#: lib/command.php:628
#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
msgstr "您未告知此个人信息"
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定要取消订阅的用户名"
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "取消订阅 %s"
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr "通告关闭。"
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr "通告开启。"
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "取消订阅 %s"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6484,6 +6715,10 @@ msgid "Repeat this notice?"
msgstr "无法删除通告。"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "是"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "无法删除通告。"
@@ -6689,47 +6924,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr "一年前"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index d721d5979..3747c7173 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:38+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:45:05+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -75,8 +75,13 @@ msgstr "無此使用者"
msgid "Save access settings"
msgstr "線上即時通設定"
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
#. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
msgctxt "BUTTON"
msgid "Save"
msgstr ""
@@ -107,7 +112,7 @@ msgstr "無此通知"
#: 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:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "無此使用者"
@@ -342,7 +347,7 @@ msgstr ""
msgid "This status is already a favorite."
msgstr ""
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr ""
@@ -463,7 +468,7 @@ msgstr "目前無請求"
msgid "You are already a member of that group."
msgstr ""
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -516,17 +521,17 @@ msgid "Invalid token."
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/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr ""
@@ -827,29 +835,44 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
msgid "No"
msgstr ""
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "無此使用者"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
msgid "Yes"
msgstr ""
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "無此使用者"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr ""
@@ -862,8 +885,8 @@ msgstr ""
#: 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:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
#, fuzzy
msgid "No such group."
msgstr "無此通知"
@@ -925,16 +948,24 @@ msgstr ""
msgid "That address has already been confirmed."
msgstr ""
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "無法更新使用者"
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "無法取消信箱確認"
@@ -992,12 +1023,14 @@ msgid ""
"connections."
msgstr ""
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "無此通知"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "請在140個字以內描述你自己與你的興趣"
@@ -1031,12 +1064,14 @@ msgstr ""
msgid "Are you sure you want to delete this notice?"
msgstr ""
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "無此通知"
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
msgid "Delete this notice"
msgstr ""
@@ -1060,7 +1095,8 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "無此使用者"
@@ -1180,15 +1216,13 @@ msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr ""
@@ -1324,180 +1358,237 @@ msgstr "無法存取個人圖像資料"
msgid "Options saved."
msgstr ""
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "線上即時通設定"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr ""
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "信箱"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "確認信箱"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr ""
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
msgid "Remove"
msgstr ""
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "取消"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "確認信箱"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr ""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "新增"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
msgid "New"
msgstr ""
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
-msgstr ""
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
+msgstr "確認信箱"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr ""
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr ""
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr ""
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr ""
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr ""
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
msgstr ""
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr ""
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr ""
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "此信箱無效"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr ""
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr ""
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "無法輸入確認碼"
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
-msgstr ""
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "請輸入暱稱或電子信箱"
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "確認取消"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr ""
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
-msgstr ""
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
+msgstr "此電子信箱已註冊過了"
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -1691,17 +1782,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "無法連結到伺服器:%s"
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "無此使用者"
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1876,28 +1969,42 @@ msgstr ""
msgid "Error removing the block."
msgstr "儲存使用者發生錯誤"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "線上即時通設定"
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "個人首頁位址錯誤"
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "線上即時通信箱"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "目前已確認的Jabber/Gtalk地址"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1906,65 +2013,107 @@ msgstr ""
"等待確認此信箱。看看你的Jabber/GTalk是否有訊息指示下一步動作。(你加入%s到你的"
"好友清單了嗎?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "線上即時通信箱"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr ""
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr ""
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr ""
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "查無此Jabber ID"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "此JabberID錯誤"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "此JabberID無效"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr ""
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "此Jabber ID已有人使用"
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "無法取消信箱確認"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "確認取消"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr ""
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr ""
+
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2005,7 +2154,9 @@ msgstr ""
msgid "You are already subscribed to these users:"
msgstr ""
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr ""
@@ -2099,7 +2250,9 @@ msgstr ""
msgid "No nickname or ID."
msgstr "無暱稱"
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -2108,11 +2261,13 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
msgstr ""
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s的狀態是%2$s"
@@ -2220,12 +2375,12 @@ msgstr ""
msgid "New message"
msgstr ""
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr ""
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "無內容"
@@ -2233,7 +2388,7 @@ msgstr "無內容"
msgid "No recipient specified."
msgstr ""
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
@@ -2489,7 +2644,7 @@ msgid "6 or more characters"
msgstr "6個以上字元"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "確認"
@@ -3820,98 +3975,156 @@ msgstr ""
msgid "Save site notice"
msgstr "新訊息"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "線上即時通設定"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "個人首頁位址錯誤"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "線上即時通信箱"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr ""
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr ""
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "確認"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
msgid "SMS phone number"
msgstr ""
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr ""
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr ""
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr ""
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr ""
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr ""
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "確認取消"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr ""
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
msgid "Mobile carrier"
msgstr ""
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr ""
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr ""
@@ -5112,10 +5325,8 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
msgid "Cancel"
msgstr "取消"
@@ -5188,35 +5399,41 @@ msgstr ""
msgid "Notice with that id does not exist"
msgstr ""
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
#, fuzzy
msgid "User has no last notice"
msgstr "新訊息"
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, php-format
msgid "Could not find a user with nickname %s"
msgstr "無法更新使用者"
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
#, fuzzy, php-format
msgid "Could not find a local user with nickname %s"
msgstr "無法更新使用者"
-#: lib/command.php:176
+#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
msgstr ""
-#: lib/command.php:221
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
msgstr ""
-#: lib/command.php:254
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5224,199 +5441,203 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:296
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr ""
-#: lib/command.php:317
+#: lib/command.php:323
#, fuzzy
msgid "You are already a member of that group"
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:331
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1$s的狀態是%2$s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
msgstr "無法從 %s 建立OpenID"
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1$s的狀態是%2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "全名"
+#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr ""
+#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr ""
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr ""
-#: lib/command.php:437
+#: lib/command.php:457
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:470
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:490
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:495
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "無此使用者"
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "更新個人圖像"
-#: lib/command.php:505
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:536
+#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:545
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "&s的微型部落格"
-#: lib/command.php:547
+#: lib/command.php:573
msgid "Error saving notice."
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:594
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:602
+#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
-#: lib/command.php:608
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:638
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:659
+#: lib/command.php:685
msgid "Notification off."
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:682
+#: lib/command.php:708
msgid "Notification on."
msgstr ""
-#: lib/command.php:684
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:697
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:708
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:735
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "此帳號已註冊"
-#: lib/command.php:752
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:754
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:774
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:776
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:796
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:798
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-#: lib/command.php:812
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6268,6 +6489,10 @@ msgid "Repeat this notice?"
msgstr "無此通知"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "無此通知"
@@ -6462,47 +6687,57 @@ msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
msgid "about a day ago"
msgstr ""
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
msgid "about a month ago"
msgstr ""
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
msgid "about a year ago"
msgstr ""