summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-05-25 13:41:23 +0200
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-05-25 13:41:23 +0200
commitdb603a39f8e521796293f694449c22679fc90caa (patch)
tree7056d9f6b799f2febb3b849f0be28603215ba194
parentf429c1aaa0d8fc69567d698bf033cf25f089d6c9 (diff)
Localisation updates from http://translatewiki.net
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po224
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po214
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po288
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po224
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po224
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po224
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po233
-rw-r--r--locale/statusnet.pot209
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po224
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po234
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po213
39 files changed, 4428 insertions, 4131 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index b9f82c0f8..79e5e7cd8 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:16+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:28+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -387,7 +387,7 @@ msgstr ""
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
@@ -395,26 +395,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Nie 'n geldige gebruikersnaam nie."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Tuisblad is nie 'n geldige URL nie."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Volledige naam is te lang (maksimum 255 karakters)."
@@ -426,7 +426,7 @@ msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Ligging is te lank is (maksimum 255 karakters)."
@@ -518,12 +518,12 @@ msgstr "Ongeldige token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -588,8 +588,8 @@ msgstr ""
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -597,8 +597,8 @@ msgid "Nickname"
msgstr "Bynaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wagwoord"
@@ -804,11 +804,11 @@ msgstr "Die avatar is verwyder."
msgid "You already blocked that user."
msgstr "U het reeds die gebruiker geblokkeer."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokkeer gebruiker"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -820,7 +820,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -830,7 +830,7 @@ msgstr "Nee"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Moenie hierdie gebruiker blokkeer nie"
@@ -839,7 +839,7 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -848,11 +848,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkeer hierdie gebruiker"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1010,7 +1010,7 @@ msgstr "Skrap hierdie applikasie"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nie aangeteken nie."
@@ -1457,7 +1457,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
@@ -1680,13 +1680,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Geen profiel verskaf nie."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Daar is geen profiel met daardie ID nie."
@@ -2197,50 +2197,50 @@ msgstr "U is nie 'n lid van daardie groep nie."
msgid "%1$s left group %2$s"
msgstr "%1$s het die groep %2$s verlaat"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U is reeds aangeteken."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Verkeerde gebruikersnaam of wagwoord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanteken"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Teken aan"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Onthou my"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wagwoord verloor of vergeet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Verkeerde gebruikersnaam of wagwoord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2563,7 +2563,7 @@ msgid "6 or more characters"
msgstr "6 of meer karakters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestig"
@@ -2575,11 +2575,11 @@ msgstr "Dieselfde as wagwoord hierbo"
msgid "Change"
msgstr "Wysig"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Wagwoord moet 6 of meer karakters bevat."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Wagwoorde is nie dieselfde nie."
@@ -2800,43 +2800,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Tuisblad"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ligging"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2876,7 +2876,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3120,7 +3120,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3128,100 +3128,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Die registrasie is voltooi"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreer"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrasie nie toegelaat nie."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Die E-posadres bestaan reeds."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wagwoord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-pos"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3240,7 +3240,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5318,14 +5318,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Tuisblad: %s"
@@ -5803,8 +5803,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5820,19 +5827,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Beskrywing: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5846,30 +5853,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5886,13 +5893,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuwe privaat boodskap vanaf %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5912,13 +5919,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5940,7 +5947,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5948,13 +5955,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6271,7 +6278,7 @@ msgstr "Daaglikse gemiddelde"
msgid "All groups"
msgstr "Alle groepe"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6295,7 +6302,7 @@ msgstr "Uitgelig"
msgid "Popular"
msgstr "Gewild"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6316,7 +6323,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6494,56 +6501,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 24253a970..81269626b 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:19+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:31+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -381,32 +381,32 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -418,7 +418,7 @@ msgstr ""
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -510,12 +510,12 @@ msgstr "حجم غير صالح."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -582,8 +582,8 @@ msgstr ""
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -591,8 +591,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمة السر"
@@ -798,11 +798,11 @@ msgstr "حُذف الأفتار."
msgid "You already blocked that user."
msgstr "لقد منعت مسبقا هذا المستخدم."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -814,7 +814,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -823,7 +823,7 @@ msgstr "لا"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -832,7 +832,7 @@ msgstr "لا تمنع هذا المستخدم"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -840,11 +840,11 @@ msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -1002,7 +1002,7 @@ msgstr "احذف هذا التطبيق"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "لست والجًا."
@@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1666,13 +1666,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا ملف شخصي مُحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا ملف شخصي بهذه الهوية."
@@ -2185,51 +2185,51 @@ msgstr "لست عضوا في تلك المجموعة."
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالفعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمة السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "لُج باسم مستخدم وكلمة سر"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2553,7 +2553,7 @@ msgid "6 or more characters"
msgstr "6 أحرف أو أكثر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2565,11 +2565,11 @@ msgstr "نفس كلمة السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2791,43 +2791,43 @@ msgstr "معلومات الملف الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصفحة الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "تكلم عن نفسك واهتمامتك في %d حرف"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
@@ -2868,7 +2868,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن يستخدم لغير البشر)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3118,7 +3118,7 @@ msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3126,100 +3126,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوة غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "لا يُسمح بالتسجيل."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمة سر غير صالحة."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "نفس كلمة السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3238,7 +3238,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5348,14 +5348,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصفحة الرئيسية: %s"
@@ -5893,8 +5893,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5920,19 +5927,19 @@ msgstr ""
"غيّر خيارات البريد الإلكتروني والإشعار في %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "السيرة: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5946,30 +5953,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حالة %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "تأكيد الرسالة القصيرة"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "لقد نبهك %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5986,13 +5993,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رسالة خاصة جديدة من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6012,13 +6019,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6040,7 +6047,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6048,13 +6055,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6371,7 +6378,7 @@ msgstr "المُعدّل اليومي"
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6395,7 +6402,7 @@ msgstr "مُختارون"
msgid "Popular"
msgstr "محبوبة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6416,7 +6423,7 @@ msgstr "كرّر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6595,56 +6602,56 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 12f575846..e6155391f 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:22+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:34+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -388,32 +388,32 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -425,7 +425,7 @@ msgstr ""
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -518,12 +518,12 @@ msgstr "حجم غير صالح."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -590,8 +590,8 @@ msgstr ""
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +599,8 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "كلمه السر"
@@ -807,11 +807,11 @@ msgstr "حُذف الأفتار."
msgid "You already blocked that user."
msgstr "لقد منعت مسبقا هذا المستخدم."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "امنع المستخدم"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -823,7 +823,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -833,7 +833,7 @@ msgstr "لا"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
@@ -842,7 +842,7 @@ msgstr "لا تمنع هذا المستخدم"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -851,11 +851,11 @@ msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "امنع هذا المستخدم"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
@@ -1018,7 +1018,7 @@ msgstr "احذف هذا الإشعار"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "لست والجًا."
@@ -1466,7 +1466,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -1692,13 +1692,13 @@ msgstr "المستخدم مسكت من قبل."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "لا ملف شخصى مُحدّد."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "لا ملف شخصى بهذه الهويه."
@@ -2210,50 +2210,50 @@ msgstr "لست عضوا فى تلك المجموعه."
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالفعل."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "أنسيت كلمه السر؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2577,7 +2577,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "أكّد"
@@ -2589,11 +2589,11 @@ msgstr "نفس كلمه السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -2814,43 +2814,43 @@ msgstr "معلومات الملف الشخصي"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "الاسم الكامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصفحه الرئيسية"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "السيرة"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "الموقع"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2890,7 +2890,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3140,7 +3140,7 @@ msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -3148,100 +3148,100 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "عذرا، رمز دعوه غير صالح."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "لا يُسمح بالتسجيل."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمه سر غير صالحه."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "نفس كلمه السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3260,7 +3260,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5393,14 +5393,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "الصفحه الرئيسية: %s"
@@ -5888,8 +5888,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5905,19 +5912,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "عن نفسك: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5931,30 +5938,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "حاله %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5971,13 +5978,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "رساله خاصه جديده من %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5997,13 +6004,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6025,7 +6032,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6033,13 +6040,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6357,7 +6364,7 @@ msgstr ""
msgid "All groups"
msgstr "كل المجموعات"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6381,7 +6388,7 @@ msgstr "مُختارون"
msgid "Popular"
msgstr "مشهورة"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "لا مدخلات رجوع إلى."
@@ -6402,7 +6409,7 @@ msgstr "كرر هذا الإشعار"
msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6582,56 +6589,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 10f4fc66e..517719b49 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:25+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:38+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -387,7 +387,7 @@ msgstr "Целевият потребител не беше открит."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
@@ -395,26 +395,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Неправилен псевдоним."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Адресът на личната страница не е правилен URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -426,7 +426,7 @@ msgstr "Описанието е твърде дълго (до %d символа)
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -518,12 +518,12 @@ msgstr "Неправилен размер."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -590,8 +590,8 @@ msgstr ""
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -599,8 +599,8 @@ msgid "Nickname"
msgstr "Псевдоним"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Парола"
@@ -810,11 +810,11 @@ msgstr "Аватарът е изтрит."
msgid "You already blocked that user."
msgstr "Вече сте блокирали този потребител."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -826,7 +826,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -835,7 +835,7 @@ msgstr "Не"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Да не се блокира този потребител"
@@ -844,7 +844,7 @@ msgstr "Да не се блокира този потребител"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -852,11 +852,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокиране на потребителя"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
@@ -1015,7 +1015,7 @@ msgstr "Изтриване на това приложение"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Не сте влезли в системата."
@@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилен адрес на е-поща."
@@ -1710,13 +1710,13 @@ msgstr "Потребителят вече е заглушен."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Не е указан профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Не е открит профил с такъв идентификатор."
@@ -2281,40 +2281,40 @@ msgstr "Не членувате в тази група."
msgid "%1$s left group %2$s"
msgstr "%1$s напусна групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вече сте влезли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Грешно име или парола."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вход в сайта"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубена или забравена парола"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,12 +2322,12 @@ msgstr ""
"За по-голяма сигурност, моля въведете отново потребителското си име и парола "
"при промяна на настройките."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Вход с име и парола"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2669,7 +2669,7 @@ msgid "6 or more characters"
msgstr "6 или повече знака"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потвърждаване"
@@ -2681,11 +2681,11 @@ msgstr "Също като паролата по-горе"
msgid "Change"
msgstr "Промяна"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Паролата трябва да е 6 или повече знака."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролите не съвпадат."
@@ -2908,43 +2908,43 @@ msgstr "Данни на профила"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Пълно име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична страница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете себе си и интересите си в до %d букви"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете себе си и интересите си"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "За мен"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Местоположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде се намирате (град, община, държава и т.н.)"
@@ -2986,7 +2986,7 @@ msgstr ""
"Автоматично абониране за всеки, който се абонира за мен (подходящо за "
"ботове)."
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографията е твърде дълга (до %d символа)."
@@ -3234,7 +3234,7 @@ msgstr "Паролата трябва да е от поне 6 знака."
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не съвпадат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка в настройките на потребителя."
@@ -3242,103 +3242,103 @@ msgstr "Грешка в настройките на потребителя."
msgid "New password successfully saved. You are now logged in."
msgstr "Новата парола е запазена. Влязохте успешно."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Грешка в кода за потвърждение."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Записването не е позволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Не можете да се регистрате, ако не сте съгласни с лиценза."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Адресът на е-поща вече се използва."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Неправилно име или парола."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
"поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 или повече знака. Задължително поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Е-поща"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Използва се само за промени, обяви или възстановяване на паролата"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3371,7 +3371,7 @@ msgstr ""
"Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
"само приятни мигове!"
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5556,14 +5556,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
@@ -6050,8 +6050,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s вече получава бележките ви в %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6077,19 +6084,19 @@ msgstr ""
"Може да смените адреса и настройките за уведомяване по е-поща на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Биография: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Нов адрес на е-поща за публикщуване в %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6103,30 +6110,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Състояние на %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Потвърждение за SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Очаква се потвърждение за този телефонен номер."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Побутнати сте от %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6143,13 +6150,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ново лично съобщение от %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6169,13 +6176,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) отбеляза бележката ви като любима"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6197,7 +6204,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6205,13 +6212,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6533,7 +6540,7 @@ msgstr ""
msgid "All groups"
msgstr "Всички групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6557,7 +6564,7 @@ msgstr "Избрано"
msgid "Popular"
msgstr "Популярно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Липсват аргументи return-to."
@@ -6578,7 +6585,7 @@ msgstr "Повтаряне на тази бележка"
msgid "Revoke the \"%s\" role from this user"
msgstr "Списък с потребителите в тази група."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6761,56 +6768,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "преди около час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "преди около месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 0c64a7aa0..fb28431ff 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:28+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:41+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -383,32 +383,32 @@ msgstr "Diposubl eo kavout an implijer pal."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "N'eo ket ul lesanv mat."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
@@ -420,7 +420,7 @@ msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
@@ -511,12 +511,12 @@ msgstr "Fichenn direizh."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -581,8 +581,8 @@ msgstr ""
msgid "Account"
msgstr "Kont"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -590,8 +590,8 @@ msgid "Nickname"
msgstr "Lesanv"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Ger-tremen"
@@ -797,11 +797,11 @@ msgstr "Dilammet eo bet an Avatar."
msgid "You already blocked that user."
msgstr "Stanket o peus dija an implijer-mañ."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -813,7 +813,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -822,7 +822,7 @@ msgstr "Nann"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Arabat stankañ an implijer-mañ"
@@ -831,7 +831,7 @@ msgstr "Arabat stankañ an implijer-mañ"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -839,11 +839,11 @@ msgid "Yes"
msgstr "Ya"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Diposubl eo enrollañ an titouroù stankañ."
@@ -1002,7 +1002,7 @@ msgstr "Dilemel ar poelad-se"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nann-luget."
@@ -1443,7 +1443,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -1663,13 +1663,13 @@ msgstr "An implijer-mañ en deus dija ar roll-mañ."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "N'eo bet resisaet profil ebet"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "N'eus profil ebet gant an ID-mañ."
@@ -2181,43 +2181,43 @@ msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Kevreet oc'h dija."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Ur fazi 'zo bet e-pad hizivadenn an implijer. Moarvat n'oc'h ket aotreet "
"evit en ober."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kevreañ"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kevreañ d'al lec'hienn"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kaout soñj"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Digeriñ va dalc'h war-eeun ar wechoù o tont ; arabat en ober war "
"urzhiataeroù rannet pe publik !"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ha kollet o peus ho ker-tremen ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2225,11 +2225,11 @@ msgstr ""
"Evit abegoù a surentezh, mar plij adlakait hoc'h anv implijer hag ho ker-"
"tremen a-benn enrollañ ho penndibaboù."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2554,7 +2554,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/register.php:440
msgid "Confirm"
msgstr "Kadarnaat"
@@ -2566,11 +2566,11 @@ msgstr "Memestra eget ar ger tremen a-us"
msgid "Change"
msgstr "Kemmañ"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Ne glot ket ar gerioù-tremen."
@@ -2794,43 +2794,43 @@ msgstr "Titouroù ar profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Anv klok"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pajenn degemer"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Buhezskrid"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lec'hiadur"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
@@ -2874,7 +2874,7 @@ msgstr ""
"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
"evit an implijerien nann-denel)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
@@ -3129,7 +3129,7 @@ msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
msgid "Password and confirmation do not match."
msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
@@ -3137,104 +3137,104 @@ msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
msgid "New password successfully saved. You are now logged in."
msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
"enskrivañ."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Digarezit, kod pedadenn direizh."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Krouet eo bet ar gont."
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Krouiñ ur gont"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "N'eo ket aotreet krouiñ kontoù."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
"gont."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Implijet eo dija ar chomlec'h postel-se."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 arouezenn pe muioc'h. Rekis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Memestra hag ar ger-tremen a-us. Rekis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Postel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3253,7 +3253,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5341,14 +5341,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Lec'hienn Web : %s"
@@ -5829,8 +5829,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5846,19 +5853,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Chomlec'h postel nevez evit embann e %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5872,30 +5879,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statud %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Kadarnadur SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5912,13 +5919,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Kemenadenn personel nevez a-berzh %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5938,13 +5945,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5966,7 +5973,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5977,13 +5984,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6300,7 +6307,7 @@ msgstr "Keidenn pemdeziek"
msgid "All groups"
msgstr "An holl strolladoù"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6324,7 +6331,7 @@ msgstr ""
msgid "Popular"
msgstr "Poblek"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6345,7 +6352,7 @@ msgstr "Adkregiñ gant an ali-mañ"
msgid "Revoke the \"%s\" role from this user"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6523,56 +6530,56 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 d2bb7867a..342229661 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:32+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:45+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -398,7 +398,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
@@ -406,26 +406,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "La pàgina personal no és un URL vàlid."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
@@ -437,7 +437,7 @@ msgstr "La descripció és massa llarga (màx. %d caràcters)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
@@ -528,12 +528,12 @@ msgstr "El testimoni no és vàlid."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -605,8 +605,8 @@ msgstr ""
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Sobrenom"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasenya"
@@ -824,11 +824,11 @@ msgstr "S'ha eliminat l'avatar."
msgid "You already blocked that user."
msgstr "Ja heu blocat l'usuari."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloca l'usuari"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -843,7 +843,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -852,7 +852,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquis l'usuari"
@@ -861,7 +861,7 @@ msgstr "No bloquis l'usuari"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -869,11 +869,11 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloca aquest usuari"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "No s'ha pogut desar la informació del bloc."
@@ -1034,7 +1034,7 @@ msgstr "Elimina aquesta aplicació"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "No heu iniciat una sessió."
@@ -1483,7 +1483,7 @@ msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
@@ -1711,13 +1711,13 @@ msgstr "L'usuari ja té aquest rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No s'ha especificat cap perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No hi ha cap perfil amb aquesta ID."
@@ -2286,43 +2286,43 @@ msgstr "No ets membre d'aquest grup."
msgid "%1$s left group %2$s"
msgstr "%1$s ha abandonat el grup %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ja estàs connectat."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"S'ha produït un error en definir l'usuari. Probablement no hi esteu "
"autoritzat."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
"compartits!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Contrasenya oblidada o perduda?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2330,11 +2330,11 @@ msgstr ""
"Per raons de seguretat, torneu a escriure el vostre nom d'usuari i "
"contrasenya abans de canviar la vostra configuració."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2671,7 +2671,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/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2683,11 +2683,11 @@ msgstr "Igual a la contrasenya de dalt"
msgid "Change"
msgstr "Canviar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les contrasenyes no coincideixen."
@@ -2914,43 +2914,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pàgina personal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL del teu web, blog o perfil en un altre lloc"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviu qui sou i els vostres interessos en %d caràcters"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Feu una descripció personal i interessos"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicació"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
@@ -2994,7 +2994,7 @@ msgstr ""
"Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-"
"humans)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia és massa llarga (màx. %d caràcters)."
@@ -3258,7 +3258,7 @@ msgstr "La contrasenya ha de tenir 6 o més caràcters."
msgid "Password and confirmation do not match."
msgstr "La contrasenya i la confirmació no coincideixen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
@@ -3266,39 +3266,39 @@ msgstr "Error en configurar l'usuari."
msgid "New password successfully saved. You are now logged in."
msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El codi d'invitació no és vàlid."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registre no permès."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "L'adreça de correu electrònic ja existeix."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nom d'usuari o contrasenya invàlids."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3306,57 +3306,58 @@ msgstr ""
"Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
"enllaçar a amics i col·legues. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o més caràcters. Requerit."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual a la contrasenya de dalt. Requerit."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correu electrònic"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom llarg, preferiblement el vostre nom «real»"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "El contingut i les dades de %1$s són privades i confidencials."
+msgstr ""
+"Entenc que el contingut i les dades de %1$s són privades i confidencials."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "El meu text i els meus fitxers són copyright de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "El meu text i els meus fitxers es troben sota el meu propi copyright."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Tots els drets reservats."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3366,7 +3367,7 @@ msgstr ""
"les dades privades: contrasenya, adreça de correu electrònic, adreça de "
"missatgeria instantània i número de telèfon."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3399,7 +3400,7 @@ msgstr ""
"\n"
"Gràcies per registrar-vos-hi i esperem que en gaudiu."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5598,14 +5599,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pàgina web: %s"
@@ -6140,8 +6141,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6167,19 +6175,19 @@ msgstr ""
"Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografia: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nou correu electrònic per publicar a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6201,30 +6209,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s estat"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmació SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Has estat reclamat per %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6251,13 +6259,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nou missatge privat de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6291,13 +6299,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha afegit el vostre avís com a preferit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6335,7 +6343,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6346,13 +6354,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) us ha enviat un avís a la vostra atenció"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6703,7 +6711,7 @@ msgstr "Mitjana diària"
msgid "All groups"
msgstr "Tots els grups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Mètode no implementat"
@@ -6727,7 +6735,7 @@ msgstr "Destacat"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No hi ha arguments de retorn."
@@ -6748,7 +6756,7 @@ msgstr "Repeteix l'avís"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca el rol «%s» de l'usuari"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
@@ -6926,56 +6934,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 81489316b..3bf855f72 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:35+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:48+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -399,32 +399,32 @@ msgstr "Nelze aktualizovat uživatele"
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Přezdívka může obsahovat pouze malá písmena a čísla bez mezer"
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou"
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Stránka není platnou URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
@@ -436,7 +436,7 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
@@ -531,12 +531,12 @@ msgstr "Neplatná velikost"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -605,8 +605,8 @@ msgstr ""
msgid "Account"
msgstr "O nás"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Přezdívka"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Heslo"
@@ -832,12 +832,12 @@ msgstr "Avatar smazán."
msgid "You already blocked that user."
msgstr "Již jste přihlášen"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Žádný takový uživatel."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -849,7 +849,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -859,7 +859,7 @@ msgstr "Ne"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Žádný takový uživatel."
@@ -869,7 +869,7 @@ msgstr "Žádný takový uživatel."
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -878,11 +878,11 @@ msgid "Yes"
msgstr "Ano"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "Odstranit toto oznámení"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nepřihlášen"
@@ -1519,7 +1519,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
@@ -1756,13 +1756,13 @@ msgstr "Uživatel nemá profil."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2303,51 +2303,51 @@ msgstr "Neodeslal jste nám profil"
msgid "%1$s left group %2$s"
msgstr "%1 statusů na %2"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Již přihlášen"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamatuj si mě"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Příště automaticky přihlásit; ne pro počítače, které používá "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ztracené nebo zapomenuté heslo?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2688,7 +2688,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/register.php:440
msgid "Confirm"
msgstr "Heslo znovu"
@@ -2700,11 +2700,11 @@ msgstr "Stejné jako heslo výše"
msgid "Change"
msgstr "Změnit"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hesla nesouhlasí"
@@ -2940,43 +2940,43 @@ msgstr "Neznámý profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Celé jméno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Popiš sebe a své zájmy ve 140 znacích"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Popište sebe a své zájmy"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mě"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Umístění"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
@@ -3016,7 +3016,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
@@ -3268,7 +3268,7 @@ msgstr "Heslo musí být alespoň 6 znaků dlouhé"
msgid "Password and confirmation do not match."
msgstr "Heslo a potvrzení nesouhlasí"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
@@ -3276,94 +3276,94 @@ msgstr "Chyba nastavení uživatele"
msgid "New password successfully saved. You are now logged in."
msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Chyba v ověřovacím kódu"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Emailová adresa již existuje"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3372,7 +3372,7 @@ msgstr ""
" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
"číslo."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3391,7 +3391,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5598,14 +5598,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6105,8 +6105,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1 od teď naslouchá tvým sdělením v %2"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6128,19 +6135,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "O mě"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6154,30 +6161,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6194,13 +6201,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6220,13 +6227,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1 od teď naslouchá tvým sdělením v %2"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6248,7 +6255,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6256,13 +6263,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6591,7 +6598,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6616,7 +6623,7 @@ msgstr ""
msgid "Popular"
msgstr "Hledání lidí"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Žádný takový dokument."
@@ -6640,7 +6647,7 @@ msgstr "Odstranit toto oznámení"
msgid "Revoke the \"%s\" role from this user"
msgstr "Žádný takový uživatel."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6827,56 +6834,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 b221c99ba..6a6a5cbfa 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
# Author@translatewiki.net: Michael
# Author@translatewiki.net: Michi
# Author@translatewiki.net: Pill
+# Author@translatewiki.net: The Evil IP address
# Author@translatewiki.net: Umherirrender
# --
# This file is distributed under the same license as the StatusNet package.
@@ -15,12 +16,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:38+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:51+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -404,7 +405,7 @@ msgstr "Konnte keine Statusmeldungen finden."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
@@ -412,27 +413,27 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ungültiger Nutzername."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr ""
"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
@@ -444,7 +445,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -535,12 +536,12 @@ msgstr "Ungültiges Token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -610,8 +611,8 @@ msgstr ""
msgid "Account"
msgstr "Profil"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +620,8 @@ msgid "Nickname"
msgstr "Nutzername"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passwort"
@@ -831,11 +832,11 @@ msgstr "Avatar gelöscht."
msgid "You already blocked that user."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Benutzer blockieren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -850,7 +851,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -859,7 +860,7 @@ msgstr "Nein"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Diesen Benutzer freigeben"
@@ -868,7 +869,7 @@ msgstr "Diesen Benutzer freigeben"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -876,11 +877,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
@@ -1040,7 +1041,7 @@ msgstr "Programm löschen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Nicht angemeldet."
@@ -1494,7 +1495,7 @@ msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
@@ -1722,13 +1723,13 @@ msgstr "Nutzer hat diese Aufgabe bereits"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Kein Profil angegeben."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Kein Benutzer-Profil mit dieser ID."
@@ -2302,40 +2303,40 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Bereits angemeldet."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Falscher Benutzername oder Passwort."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Passwort vergessen?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2343,11 +2344,11 @@ msgstr ""
"Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
"ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Mit Nutzernamen und Passwort anmelden."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2686,7 +2687,7 @@ msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bestätigen"
@@ -2698,11 +2699,11 @@ msgstr "Gleiches Passwort wie zuvor"
msgid "Change"
msgstr "Ändern"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwörter stimmen nicht überein."
@@ -2929,44 +2930,44 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Vollständiger Name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschreibe dich selbst und deine Interessen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Aufenthaltsort"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
@@ -3010,7 +3011,7 @@ msgstr ""
"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
"Menschen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Die Biografie ist zu lang (max. %d Zeichen)"
@@ -3274,7 +3275,7 @@ msgstr "Passwort muss mehr als 6 Zeichen enthalten"
msgid "Password and confirmation do not match."
msgstr "Passwort und seine Bestätigung stimmen nicht überein."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fehler bei den Nutzereinstellungen."
@@ -3282,40 +3283,40 @@ msgstr "Fehler bei den Nutzereinstellungen."
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Entschuldigung, ungültiger Bestätigungscode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrierung nicht gestattet"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Diese E-Mail-Adresse existiert bereits."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3323,59 +3324,60 @@ msgstr ""
"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
"Pflicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 oder mehr Buchstaben. Pflicht."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-Mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Wird nur für Updates, wichtige Mitteilungen und zur "
"Passwortwiederherstellung verwendet"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein „echter“ Name"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
+msgstr ""
+"Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Meine Texte und Dateien sind urheberrechtlich geschützt durch %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Alle Rechte vorbehalten."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3384,7 +3386,7 @@ msgstr ""
"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und "
"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3417,7 +3419,7 @@ msgstr ""
"\n"
"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5611,14 +5613,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -6153,8 +6155,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6181,19 +6190,19 @@ msgstr ""
"$s ändern.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografie: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Neue E-Mail-Adresse um auf %s zu schreiben"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6215,18 +6224,18 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s Status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-Konfiguration"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
@@ -6234,13 +6243,13 @@ msgstr ""
"handelt:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du wurdest von %s angestupst"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6268,13 +6277,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Neue private Nachricht von %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6308,13 +6317,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6346,7 +6355,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6357,14 +6366,14 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
"%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6715,7 +6724,7 @@ msgstr "Tagesdurchschnitt"
msgid "All groups"
msgstr "Alle Gruppen"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Nicht unterstützte Methode."
@@ -6739,7 +6748,7 @@ msgstr "Beliebte Benutzer"
msgid "Popular"
msgstr "Beliebte Beiträge"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Kein Rückkehr Argument."
@@ -6760,7 +6769,7 @@ msgstr "Diese Nachricht wiederholen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
@@ -6938,56 +6947,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 4e8f62afe..6bf33f085 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:41+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:54+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -396,32 +396,32 @@ msgstr "Απέτυχε η εύρεση οποιασδήποτε κατάστασ
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
@@ -433,7 +433,7 @@ msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
@@ -526,12 +526,12 @@ msgstr "Μήνυμα"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -598,8 +598,8 @@ msgstr ""
msgid "Account"
msgstr "Λογαριασμός"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -607,8 +607,8 @@ msgid "Nickname"
msgstr "Ψευδώνυμο"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Κωδικός"
@@ -818,11 +818,11 @@ msgstr "Ρυθμίσεις OpenID"
msgid "You already blocked that user."
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr ""
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -834,7 +834,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -844,7 +844,7 @@ msgstr "Όχι"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
@@ -854,7 +854,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Ναι"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1033,7 +1033,7 @@ msgstr "Περιγράψτε την ομάδα ή το θέμα"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1499,7 +1499,7 @@ msgid "Cannot normalize that email address"
msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1732,13 +1732,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2262,39 +2262,39 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ήδη συνδεδεμένος."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Λάθος όνομα χρήστη ή κωδικός"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2302,12 +2302,12 @@ msgstr ""
"Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
"σας, πριν αλλάξετε τις ρυθμίσεις σας."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Σύνδεση με όνομα χρήστη και κωδικό"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2642,7 +2642,7 @@ msgid "6 or more characters"
msgstr "6 ή περισσότεροι χαρακτήρες"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Επιβεβαίωση"
@@ -2654,11 +2654,11 @@ msgstr ""
msgid "Change"
msgstr "Αλλαγή"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Οι κωδικοί δεν ταυτίζονται."
@@ -2886,44 +2886,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Ονοματεπώνυμο"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Αρχική σελίδα"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Βιογραφικό"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Τοποθεσία"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2966,7 +2966,7 @@ msgstr ""
"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα (χρήση "
"κυρίως από λογισμικό και όχι ανθρώπους)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
@@ -3215,7 +3215,7 @@ msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή
msgid "Password and confirmation do not match."
msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3223,93 +3223,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Η διεύθυνση email υπάρχει ήδη."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr ""
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3318,7 +3318,7 @@ msgstr ""
"εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, "
"διεύθυνση IM, τηλεφωνικό νούμερο."
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3352,7 +3352,7 @@ msgstr ""
"Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία "
"μας."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5502,14 +5502,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5993,8 +5993,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6010,7 +6017,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6018,13 +6025,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6038,30 +6045,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Κατάσταση του/της %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6078,13 +6085,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6104,13 +6111,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6132,7 +6139,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6140,13 +6147,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6468,7 +6475,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6492,7 +6499,7 @@ msgstr "Προτεινόμενα"
msgid "Popular"
msgstr "Δημοφιλή"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6515,7 +6522,7 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6698,56 +6705,56 @@ msgid "Moderator"
msgstr "Συντονιστής"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 a3c1605ee..fe597b75c 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to British English
#
+# Author@translatewiki.net: Brion
# Author@translatewiki.net: Bruce89
# Author@translatewiki.net: CiaranG
# Author@translatewiki.net: Reedy
@@ -10,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:44+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:36:58+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -394,32 +395,32 @@ msgstr "Could not find target user."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Nickname already in use. Try another one."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Homepage is not a valid URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Full name is too long (max 255 chars)."
@@ -431,7 +432,7 @@ msgstr "Description is too long (max %d chars)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Location is too long (max 255 chars)."
@@ -522,12 +523,12 @@ msgstr "Invalid token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -597,8 +598,8 @@ msgstr ""
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -606,8 +607,8 @@ msgid "Nickname"
msgstr "Nickname"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -813,11 +814,11 @@ msgstr "Avatar deleted."
msgid "You already blocked that user."
msgstr "You already blocked that user."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Block user"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -832,7 +833,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -841,7 +842,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Do not block this user"
@@ -850,7 +851,7 @@ msgstr "Do not block this user"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -858,11 +859,11 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Block this user"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Failed to save block information."
@@ -1023,7 +1024,7 @@ msgstr "Delete this application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Not logged in."
@@ -1472,7 +1473,7 @@ msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
@@ -1698,13 +1699,13 @@ msgstr "User already has this role."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No profile specified."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No profile with that ID."
@@ -2266,39 +2267,39 @@ msgstr "You are not a member of that group."
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Already logged in."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Incorrect username or password."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error setting user. You are probably not authorised."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Lost or forgotten password?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2306,11 +2307,11 @@ msgstr ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Login with your username and password."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2640,7 +2641,7 @@ msgid "6 or more characters"
msgstr "6 or more characters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirm"
@@ -2652,11 +2653,11 @@ msgstr "Same as password above"
msgid "Change"
msgstr "Change"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Password must be 6 or more characters."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passwords don't match."
@@ -2879,43 +2880,43 @@ msgstr "Profile information"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Full name"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe yourself and your interests in %d chars"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe yourself and your interests"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Location"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
@@ -2957,7 +2958,7 @@ msgid ""
msgstr ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio is too long (max %d chars)."
@@ -3212,7 +3213,7 @@ msgstr "Password must be 6 chars or more."
msgid "Password and confirmation do not match."
msgstr "Password and confirmation do not match."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error setting user."
@@ -3220,93 +3221,93 @@ msgstr "Error setting user."
msgid "New password successfully saved. You are now logged in."
msgstr "New password successfully saved. You are now logged in."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Sorry, only invited people can register."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry, invalid invitation code."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registration not allowed."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "You can't register if you don't agree to the licence."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-mail address already exists."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Invalid username or password."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 or more characters. Required."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Used only for updates, announcements, and password recovery"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3315,7 +3316,7 @@ msgstr ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3348,7 +3349,7 @@ msgstr ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5488,14 +5489,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Homepage: %s"
@@ -6011,8 +6012,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s is now listening to your notices on %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6038,19 +6046,19 @@ msgstr ""
"Change your email address or notification options at %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "New e-mail address for posting to %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6072,30 +6080,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS confirmation"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirm you own this phone number with this code:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "You've been nudged by %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6112,13 +6120,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "New private message from %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6138,13 +6146,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) added your notice as a favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6166,7 +6174,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6174,13 +6182,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6497,7 +6505,7 @@ msgstr ""
msgid "All groups"
msgstr "All groups"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6521,7 +6529,7 @@ msgstr "Featured"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No return-to arguments."
@@ -6542,7 +6550,7 @@ msgstr "Repeat this notice"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoke the \"%s\" role from this user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6720,56 +6728,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 268cb5c5d..fce4f361c 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:47+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:02+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -397,7 +397,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El usuario debe tener solamente letras minúsculas y números y no puede tener "
@@ -405,26 +405,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "El usuario ya existe. Prueba con otro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Usuario inválido"
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "La página de inicio no es un URL válido."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -436,7 +436,7 @@ msgstr "La descripción es demasiado larga (máx. %d caracteres)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -527,12 +527,12 @@ msgstr "Token inválido."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -605,8 +605,8 @@ msgstr ""
msgid "Account"
msgstr "Cuenta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -614,8 +614,8 @@ msgid "Nickname"
msgstr "Usuario"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contraseña"
@@ -823,11 +823,11 @@ msgstr "Imagen borrada."
msgid "You already blocked that user."
msgstr "Ya has bloqueado a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -842,7 +842,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -851,7 +851,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "No bloquear a este usuario"
@@ -860,7 +860,7 @@ msgstr "No bloquear a este usuario"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -868,11 +868,11 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
@@ -1034,7 +1034,7 @@ msgstr "Borrar esta aplicación"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "No conectado."
@@ -1486,7 +1486,7 @@ msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
@@ -1714,13 +1714,13 @@ msgstr "El usuario ya tiene esta función."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "No se especificó perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "No existe perfil con ese ID"
@@ -2289,41 +2289,41 @@ msgstr "No eres miembro de este grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ya estás conectado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nombre de usuario o contraseña incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
"compartidos! "
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Contraseña olvidada o perdida?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2331,11 +2331,11 @@ msgstr ""
"Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
"contraseña antes de cambiar tu configuración."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Ingresar con tu nombre de usuario y contraseña."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2672,7 +2672,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/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2684,11 +2684,11 @@ msgstr "Igual a la contraseña de arriba"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Cotrnaseña debe tener 6 o más caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Las contraseñas no coinciden"
@@ -2915,43 +2915,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nombre completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbete y cuéntanos tus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbete y cuéntanos acerca de tus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicación"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
@@ -2995,7 +2995,7 @@ msgstr ""
"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
"para no-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografía es muy larga (máx. %d caracteres)."
@@ -3264,7 +3264,7 @@ msgstr "La contraseña debe tener 6 o más caracteres."
msgid "Password and confirmation do not match."
msgstr "La contraseña y la confirmación no coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error al configurar el usuario."
@@ -3272,39 +3272,39 @@ msgstr "Error al configurar el usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "El código de invitación no es válido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registro de usuario no permitido."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "La dirección de correo electrónico ya existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Usuario o contraseña inválidos."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3312,58 +3312,60 @@ msgstr ""
"Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
"avisos y enviar vínculos de ellos a tus amigos y colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
"Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o más caracters. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual a la contraseña de arriba. Requerida"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "El contenido y datos de %1$s son privados y confidenciales."
+msgstr ""
+"Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
+"Mi texto y archivos est'an protegidos por los derecho de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Mi texto y archivos permanecen bajo mi propio derecho de autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Todos los derechos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3373,7 +3375,7 @@ msgstr ""
"información privada: contraseña, dirección de correo electrónico, dirección "
"de mensajería instantánea y número de teléfono."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3406,7 +3408,7 @@ msgstr ""
"\n"
"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5602,14 +5604,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página de inicio: %s"
@@ -6146,8 +6148,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6175,19 +6184,19 @@ msgstr ""
"Cambia tus preferencias de notificaciones a tu correo electrónico en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nueva dirección de correo para postear a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6209,30 +6218,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS confirmación"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha dado un toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6260,13 +6269,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuevo mensaje privado de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6300,13 +6309,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) agregó tu aviso como un favorito"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6344,7 +6353,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6355,13 +6364,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha enviado un aviso a tu atención"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6711,7 +6720,7 @@ msgstr "Promedio diario"
msgid "All groups"
msgstr "Todos los grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método no implementado."
@@ -6735,7 +6744,7 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "No hay respuesta a los argumentos."
@@ -6756,7 +6765,7 @@ msgstr "Responder este aviso."
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar el rol \"%s\" de este usuario"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ningún usuario sólo definido para modo monousuario."
@@ -6934,56 +6943,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 c4a039c31..f7d5d4c79 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:56+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:10+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -392,32 +392,32 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "برگهٔ آغازین یک نشانی معتبر نیست."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "نام کامل طولانی است (۲۵۵ حرف در حالت بیشینه(."
@@ -429,7 +429,7 @@ msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "مکان طولانی است (حداکثر ۲۵۵ حرف)"
@@ -522,12 +522,12 @@ msgstr "اندازه‌ی نادرست"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -593,8 +593,8 @@ msgstr ""
msgid "Account"
msgstr "حساب کاربری"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -602,8 +602,8 @@ msgid "Nickname"
msgstr "نام کاربری"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "گذرواژه"
@@ -814,11 +814,11 @@ msgstr "چهره پاک شد."
msgid "You already blocked that user."
msgstr "شما هم اکنون آن کاربر را مسدود کرده اید."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "مسدود کردن کاربر"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -834,7 +834,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -844,7 +844,7 @@ msgstr "خیر"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "کاربر را مسدود نکن"
@@ -853,7 +853,7 @@ msgstr "کاربر را مسدود نکن"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -862,11 +862,11 @@ msgid "Yes"
msgstr "بله"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "کاربر را مسدود کن"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1034,7 +1034,7 @@ msgstr "این پیام را پاک کن"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "شما به سیستم وارد نشده اید."
@@ -1500,7 +1500,7 @@ msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "یک آدرس ایمیل معتبر نیست."
@@ -1732,13 +1732,13 @@ msgstr "کاربر قبلا ساکت شده است."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "کاربری مشخص نشده است."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
@@ -2273,39 +2273,39 @@ msgstr "شما یک کاربر این گروه نیستید."
msgid "%1$s left group %2$s"
msgstr "%s گروه %s را ترک کرد."
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "قبلا وارد شده"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "نام کاربری یا رمز عبور نادرست."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "مرا به یاد بسپار"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "رمز عبور خود را گم یا فراموش کرده اید؟"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2313,12 +2313,12 @@ msgstr ""
"به دلایل امنیتی، لطفا نام کاربری و رمز عبور خود را قبل از تغییر تنظیمات "
"دوباره وارد نمایید."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2665,7 +2665,7 @@ msgid "6 or more characters"
msgstr "۶ نویسه یا بیش‌تر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "تایید"
@@ -2677,11 +2677,11 @@ msgstr "مثل رمز عبور بالا"
msgid "Change"
msgstr "تغییر"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "گذرواژه‌ها مطابقت ندارند."
@@ -2907,43 +2907,43 @@ msgstr "اطلاعات شناس‌نامه"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "نام‌کامل"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "صفحهٔ خانگی"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا مشخصات کاربری‌تان در یک وب‌گاه دیگر"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "خودتان و علایقتان را توصیف کنید."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "شرح‌حال"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "موقعیت"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2983,7 +2983,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3231,7 +3231,7 @@ msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد
msgid "Password and confirmation do not match."
msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3239,93 +3239,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "با عرض تاسف، کد دعوت نا معتبر است."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "ثبت نام با موفقیت انجام شد."
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "اجازه‌ی ثبت نام داده نشده است."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "آدرس ایمیل از قبل وجود دارد."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "نام کاربری یا کلمه ی عبور نا معتبر."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "۶ کاراکتر یا بیشتر نیاز است."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "پست الکترونیکی"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3334,7 +3334,7 @@ msgstr ""
"به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره "
"تلفن."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3353,7 +3353,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5508,14 +5508,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "صفحه خانگی : %s"
@@ -5995,8 +5995,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%2$s از حالا به خبر های شما گوش میده %1$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6012,19 +6019,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "موقعیت : %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s ادرس ایمیل جدید برای"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6044,30 +6051,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "وضعیت %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "تایید پیامک"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "منتظر تاییدیه برای این شماره تلفن."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6084,13 +6091,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6110,13 +6117,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr " خبر شما را به علایق خود اضافه کرد %s (@%s)"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6138,7 +6145,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6146,13 +6153,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "به توجه شما یک خبر فرستاده شده %s (@%s)"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6474,7 +6481,7 @@ msgstr ""
msgid "All groups"
msgstr "تمام گروه‌ها"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6498,7 +6505,7 @@ msgstr "خصوصیت"
msgid "Popular"
msgstr "محبوب"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6520,7 +6527,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر را به گروه مسدود کن"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6699,56 +6706,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 48a25ce22..4e7b510e2 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:39:53+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:07+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -408,7 +408,7 @@ msgstr "Ei löytynyt yhtään päivitystä."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
@@ -416,26 +416,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
@@ -447,7 +447,7 @@ msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
@@ -540,12 +540,12 @@ msgstr "Koko ei kelpaa."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -615,8 +615,8 @@ msgstr ""
msgid "Account"
msgstr "Käyttäjätili"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -624,8 +624,8 @@ msgid "Nickname"
msgstr "Tunnus"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Salasana"
@@ -839,11 +839,11 @@ msgstr "Kuva poistettu."
msgid "You already blocked that user."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Estä käyttäjä"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -855,7 +855,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -865,7 +865,7 @@ msgstr "Ei"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
@@ -874,7 +874,7 @@ msgstr "Älä estä tätä käyttäjää"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -883,11 +883,11 @@ msgid "Yes"
msgstr "Kyllä"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
@@ -1053,7 +1053,7 @@ msgstr "Poista tämä päivitys"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Et ole kirjautunut sisään."
@@ -1531,7 +1531,7 @@ msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -1767,13 +1767,13 @@ msgstr "Käyttäjä on asettanut eston sinulle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Profiilia ei ole määritelty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ei profiilia tuolle ID:lle."
@@ -2338,42 +2338,42 @@ msgstr "Sinä et kuulu tähän ryhmään."
msgid "%1$s left group %2$s"
msgstr "%s erosi ryhmästä %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Väärä käyttäjätunnus tai salasana"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
"useampi käyttäjä!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Oletko hukannut tai unohtanut salasanasi?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2381,12 +2381,12 @@ msgstr ""
"Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
"asetuksiesi muuttamista."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2733,7 +2733,7 @@ msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Vahvista"
@@ -2745,11 +2745,11 @@ msgstr "Sama kuin ylläoleva salasana"
msgid "Change"
msgstr "Vaihda"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Salasanat eivät täsmää."
@@ -2990,43 +2990,43 @@ msgstr ""
"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
"välilyöntejä"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Koko nimi"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Tietoja"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Kotipaikka"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -3070,7 +3070,7 @@ msgstr ""
"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
"ihmiskäyttäjille)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
@@ -3322,7 +3322,7 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
msgid "Password and confirmation do not match."
msgstr "Salasana ja salasanan vahvistus eivät täsmää."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
@@ -3331,97 +3331,97 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Virheellinen kutsukoodin."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Rekisteröityminen ei ole sallittu."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Sähköpostiosoite on jo käytössä."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Käyttäjätunnus tai salasana ei kelpaa."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
"välilyöntejä. Pakollinen."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 tai useampia merkkejä. Pakollinen."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Sähköposti"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
"salasanan uudelleen käyttöönottoon."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Pitempi nimi, mieluiten oikea nimesi"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3430,7 +3430,7 @@ msgstr ""
"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3463,7 +3463,7 @@ msgstr ""
"\n"
"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5703,14 +5703,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Kotisivu: %s"
@@ -6204,8 +6204,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6231,7 +6238,7 @@ msgstr ""
"Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6239,13 +6246,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6267,30 +6274,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s päivitys"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS vahvistus"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s tönäisi sinua"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6307,13 +6314,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Uusi yksityisviesti käyttäjältä %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6333,13 +6340,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s lisäsi päivityksesi suosikkeihinsa"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6361,7 +6368,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6369,13 +6376,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6704,7 +6711,7 @@ msgstr ""
msgid "All groups"
msgstr "Kaikki ryhmät"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6728,7 +6735,7 @@ msgstr "Esittelyssä"
msgid "Popular"
msgstr "Suosituimmat"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ei id parametria."
@@ -6752,7 +6759,7 @@ msgstr "Vastaa tähän päivitykseen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6942,56 +6949,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 f5e2e9a91..d28c3721e 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:00+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:14+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -401,7 +401,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Les pseudos ne peuvent contenir que des caractères minuscules et des "
@@ -409,26 +409,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudo déjà utilisé. Essayez-en un autre."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "L’adresse du site personnel n’est pas un URL valide. "
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nom complet trop long (maximum de 255 caractères)."
@@ -440,7 +440,7 @@ msgstr "La description est trop longue (%d caractères maximum)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Emplacement trop long (maximum de 255 caractères)."
@@ -531,12 +531,12 @@ msgstr "Jeton incorrect."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -613,8 +613,8 @@ msgstr ""
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -622,8 +622,8 @@ msgid "Nickname"
msgstr "Pseudo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mot de passe"
@@ -833,11 +833,11 @@ msgstr "Avatar supprimé."
msgid "You already blocked that user."
msgstr "Vous avez déjà bloqué cet utilisateur."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -852,7 +852,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -861,7 +861,7 @@ msgstr "Non"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ne pas bloquer cet utilisateur"
@@ -870,7 +870,7 @@ msgstr "Ne pas bloquer cet utilisateur"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -878,11 +878,11 @@ msgid "Yes"
msgstr "Oui"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
@@ -1043,7 +1043,7 @@ msgstr "Supprimer cette application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non connecté."
@@ -1494,7 +1494,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
@@ -1721,13 +1721,13 @@ msgstr "L’utilisateur a déjà ce rôle."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Aucun profil n’a été spécifié."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Aucun profil ne correspond à cet identifiant."
@@ -2304,43 +2304,43 @@ msgstr "Vous n’êtes pas membre de ce groupe."
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Déjà connecté."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
"pas autorisé."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
"ordinateurs publics ou partagés)"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mot de passe perdu ?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2348,11 +2348,11 @@ msgstr ""
"Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
"votre mot de passe afin d’enregistrer vos préférences."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Ouvrez une session avec un identifiant et un mot de passe."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2692,7 +2692,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/register.php:440
msgid "Confirm"
msgstr "Confirmer"
@@ -2704,11 +2704,11 @@ msgstr "Identique au mot de passe ci-dessus"
msgid "Change"
msgstr "Modifier"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Votre mot de passe doit contenir au moins 6 caractères."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Les mots de passe ne correspondent pas."
@@ -2935,43 +2935,43 @@ msgstr "Information de profil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nom complet"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Décrivez vous et vos intérêts en %d caractères"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Décrivez vous et vos interêts"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Emplacement"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
@@ -3015,7 +3015,7 @@ msgstr ""
"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
"les utilisateurs non-humains)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La bio est trop longue (%d caractères maximum)."
@@ -3280,7 +3280,7 @@ msgstr "Le mot de passe doit contenir au moins 6 caractères."
msgid "Password and confirmation do not match."
msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
@@ -3289,39 +3289,39 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Désolé, code d’invitation invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Création de compte non autorisée."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Vous devez accepter les termes de la licence pour créer un compte."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Cette adresse courriel est déjà utilisée."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3329,58 +3329,60 @@ msgstr ""
"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
"poster des avis and et vous relier à des amis et collègues. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 caractères ou plus. Requis."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identique au mot de passe ci-dessus. Requis."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Courriel"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilisé uniquement pour les mises à jour, les notifications, et la "
"récupération de mot de passe"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
+msgstr ""
+"Je comprends que le contenu et les données de %1$s sont privés et "
+"confidentiels."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Mon texte et les fichiers sont protégés par copyright par %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Mon texte et les fichiers restent sous mon propre droit d'auteur."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Tous droits réservés."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3390,7 +3392,7 @@ msgstr ""
"données personnelles : mot de passe, adresse électronique, adresse de "
"messagerie instantanée, numéro de téléphone."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3424,7 +3426,7 @@ msgstr ""
"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
"service."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5629,14 +5631,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site Web : %s"
@@ -6180,8 +6182,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s suit maintenant vos avis sur %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6207,19 +6216,19 @@ msgstr ""
"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio : %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nouvelle adresse courriel pour poster dans %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6241,31 +6250,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Statut de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s : confirmez que vous possédez ce numéro de téléphone grâce à ce code :"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Vous avez reçu un clin d’œil de %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6293,13 +6302,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nouveau message personnel de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6333,13 +6342,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) a ajouté un de vos avis à ses favoris"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6378,7 +6387,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6389,13 +6398,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) vous a envoyé un avis"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6744,7 +6753,7 @@ msgstr "Moyenne journalière"
msgid "All groups"
msgstr "Tous les groupes"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Méthode non implémentée."
@@ -6768,7 +6777,7 @@ msgstr "En vedette"
msgid "Popular"
msgstr "Populaires"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Aucun argument de retour."
@@ -6789,7 +6798,7 @@ msgstr "Reprendre cet avis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
@@ -6967,56 +6976,56 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 64a4d3e3b..5aaa495d7 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:04+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:17+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -406,32 +406,32 @@ msgstr "Non se puido atopar ningún estado"
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non é un alcume válido."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "A páxina persoal semella que non é unha URL válida."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é demasiado longo (max 255 car)."
@@ -443,7 +443,7 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "A localización é demasiado longa (max 255 car.)."
@@ -536,12 +536,12 @@ msgstr "Tamaño inválido."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -610,8 +610,8 @@ msgstr ""
msgid "Account"
msgstr "Sobre"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -839,11 +839,11 @@ msgstr "Avatar actualizado."
msgid "You already blocked that user."
msgstr "Xa bloqueaches a este usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuario"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -858,7 +858,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -868,7 +868,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bloquear usuario"
@@ -878,7 +878,7 @@ msgstr "Bloquear usuario"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -887,12 +887,12 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Bloquear usuario"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
@@ -1062,7 +1062,7 @@ msgstr "Eliminar chío"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non está logueado."
@@ -1551,7 +1551,7 @@ msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
@@ -1789,13 +1789,13 @@ msgstr "O usuario bloqueoute."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non se atopou un perfil con ese ID."
@@ -2370,40 +2370,40 @@ msgstr "Non estás suscrito a ese perfil"
msgid "%1$s left group %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sesión xa iniciada"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "¿Perdeches a contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2411,12 +2411,12 @@ msgstr ""
"Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
"contrasinal antes de cambiar as túas preferenzas."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Accede co teu nome de usuario e contrasinal."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2764,7 +2764,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/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2776,11 +2776,11 @@ msgstr "Igual que a contrasinal de enriba"
msgid "Change"
msgstr "Modificado"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A contrasinal debe ter 6 caracteres ou máis."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As contrasinais non coinciden"
@@ -3019,44 +3019,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localización"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
@@ -3100,7 +3100,7 @@ msgstr ""
"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
"non humáns)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "O teu Bio é demasiado longo (max 140 car.)."
@@ -3359,7 +3359,7 @@ msgstr "A contrasinal debe ter 6 caracteres ou máis."
msgid "Password and confirmation do not match."
msgstr "A contrasinal e a súa confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
@@ -3367,40 +3367,40 @@ msgstr "Acounteceu un erro configurando o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpa, só se pode rexistrar a xente con invitación."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Acounteceu un erro co código de confirmación."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Non se permite o rexistro neste intre."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O enderezo de correo xa existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Usuario ou contrasinal inválidos."
-#: actions/register.php:343
+#: actions/register.php:350
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -3410,58 +3410,58 @@ msgstr ""
"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"De 1 a 64 letras minúsculas ou números, nin espazos nin signos de "
"puntuación. Requerido."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Requerido."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo Electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3470,7 +3470,7 @@ msgstr ""
" agás esta informción privada: contrasinal, dirección de correo electrónico, "
"dirección IM, número de teléfono."
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3502,7 +3502,7 @@ msgstr ""
"\n"
"Grazas por rexistrarte e esperamos que laretexes moito."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5766,14 +5766,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Páxina persoal: %s"
@@ -6323,8 +6323,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está a escoitar os teus chíos %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6346,19 +6353,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Ubicación: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nova dirección de email para posterar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6380,30 +6387,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmación de SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Agardando a confirmación neste número de teléfono."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s douche un toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6430,13 +6437,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s enviouche unha nova mensaxe privada"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6470,13 +6477,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s gustoulle o teu chío"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6510,7 +6517,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6518,13 +6525,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6863,7 +6870,7 @@ msgstr ""
msgid "All groups"
msgstr "Tódalas etiquetas"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6888,7 +6895,7 @@ msgstr "Destacado"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Non hai argumento id."
@@ -6912,7 +6919,7 @@ msgstr "Non se pode eliminar este chíos."
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -7109,56 +7116,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 6639ecf5a..59aafd22d 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:10+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:21+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -394,7 +394,7 @@ msgstr "Non se puido atopar o usuario de destino."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
@@ -402,26 +402,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "O formato do alcume non é correcto."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "O URL da páxina persoal non é correcto."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
@@ -433,7 +433,7 @@ msgstr "A descrición é longa de máis (o máximo son %d caracteres)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
@@ -524,12 +524,12 @@ msgstr "Pase incorrecto."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasinal"
@@ -821,11 +821,11 @@ msgstr "Borrouse o avatar."
msgid "You already blocked that user."
msgstr "Xa bloqueou ese usuario."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear o usuario"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,7 +840,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -849,7 +849,7 @@ msgstr "Non"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloquear este usuario"
@@ -858,7 +858,7 @@ msgstr "Non bloquear este usuario"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -866,11 +866,11 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuario"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Non se puido gardar a información do bloqueo."
@@ -1031,7 +1031,7 @@ msgstr "Borrar a aplicación"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non iniciou sesión."
@@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address"
msgstr "Non se pode normalizar ese enderezo de correo electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
@@ -1713,13 +1713,13 @@ msgstr "O usuario xa ten este rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Non se especificou ningún perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ningún perfil ten esa ID."
@@ -2231,8 +2231,8 @@ msgid ""
msgstr ""
"%1$s convidouno a unirse a el en %2$s (%3$s).\n"
"\n"
-"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas "
-"que coñece e coas que lle interesen.\n"
+"%2$s é un servizo de mensaxes de blogue curtas que lle permite estar ao día "
+"coas persoas que coñece e coas que lle interesen.\n"
"\n"
"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con "
"outros coñecidos. Tamén está moi ben para coñecer xente con intereses "
@@ -2285,43 +2285,43 @@ msgstr "Non pertence a ese grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Xa se identificou."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuario ou contrasinal incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
"para facelo."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Identificarse"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificarse no sitio"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrádeme"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
"compartidas!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Esqueceu ou perdeu o contrasinal?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2329,11 +2329,11 @@ msgstr ""
"Por razóns de seguridade, volva introducir o seu nome de usuario e "
"contrasinal antes de cambiar a súa configuración."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Identifíquese co seu nome de usuario e contrasinal."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2670,7 +2670,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/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2682,11 +2682,11 @@ msgstr "Igual ao contrasinal anterior"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "O contrasinal debe conter seis ou máis caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Os contrasinais non coinciden."
@@ -2913,43 +2913,43 @@ msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descríbase a vostede e mailos seus intereses en %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descríbase a vostede e mailos seus intereses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografía"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Lugar"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
@@ -2993,7 +2993,7 @@ msgstr ""
"Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
"bots)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A biografía é longa de máis (o límite son %d caracteres)."
@@ -3091,11 +3091,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
-"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
-"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para "
-"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis "
-"información](%%doc.help%%))"
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/). [Únase agora](%%action."
+"register%%) para compartir notas persoais cos amigos, a familia e os "
+"compañeiros! ([Máis información](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3104,9 +3104,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
-"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
-"[StatusNet](http://status.net/)."
+"Isto é %%site.name%%, un servizo de [mensaxes de blogue curtas](http://en."
+"wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
+"software libre [StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3261,7 +3261,7 @@ msgstr "O contrasinal debe ter seis ou máis caracteres."
msgid "Password and confirmation do not match."
msgstr "O contrasinal e a confirmación non coinciden."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Houbo un erro ao configurar o usuario."
@@ -3269,39 +3269,39 @@ msgstr "Houbo un erro ao configurar o usuario."
msgid "New password successfully saved. You are now logged in."
msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Só se pode rexistrar mediante invitación."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "O código da invitación é incorrecto."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rexistrouse correctamente"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrarse"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Non se permite o rexistro."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non pode rexistrarse se non acepta a licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O enderezo de correo electrónico xa existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3309,58 +3309,61 @@ msgstr ""
"Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
"e porse en contacto con amigos e compañeiros. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
"espazos, tiles ou eñes. Obrigatorio."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Obrigatorio."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome longo, preferiblemente o seu nome \"real\""
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "O contido e os datos de %1$s son privados e confidenciais."
+msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
+"Os meus textos e ficheiros están protexidos polos dereitos de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
+"Os meus textos e ficheiros están protexidos polos meus propios dereitos de "
+"autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Todos os dereitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3370,7 +3373,7 @@ msgstr ""
"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
"instantánea e números de teléfono."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3402,7 +3405,7 @@ msgstr ""
"\n"
"Grazas por rexistrarse. Esperamos que goce deste servizo."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3419,8 +3422,8 @@ msgid ""
msgstr ""
"Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%"
"action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de "
-"microblogging compatible](%%doc.openmublog%%), introduza a continuación o "
-"URL do seu perfil."
+"mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
+"continuación o URL do seu perfil."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
@@ -3444,7 +3447,8 @@ msgstr "URL do perfil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL do seu perfil noutro servizo de microblogue compatible"
+msgstr ""
+"URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
@@ -3823,8 +3827,8 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
-"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo "
@@ -3838,8 +3842,8 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
-"[microblogue](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
+"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
@@ -3934,11 +3938,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
-"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
-"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%"
-"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis "
-"xente! ([Máis información](%%%%doc.help%%%%))"
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
+"[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de "
+"moita máis xente! ([Máis información](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3947,9 +3951,9 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
-"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
-"ferramenta de software libre [StatusNet](http://status.net/). "
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
#: actions/showstream.php:305
#, php-format
@@ -4000,7 +4004,8 @@ msgstr "Nome do sitio"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\""
+"O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas "
+"da miña empresa\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -5190,14 +5195,14 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%"
-"%](%%site.broughtbyurl%%)."
+"**%%site.name%%** é un servizo de mensaxes de blogue curtas ofrecido por [%%"
+"site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr "**%%site.name%%** é un servizo de microblogue."
+msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
#: lib/action.php:824
@@ -5207,9 +5212,9 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Utiliza a versión %s do software de microblogue [StatusNet](http://status."
-"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www."
-"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
+"Utiliza a versión %s do software de mensaxes de blogue curtas [StatusNet]"
+"(http://status.net/), dispoñible baixo a [Licenza Pública Xeral Affero de "
+"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
#: lib/action.php:840
@@ -5596,14 +5601,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Sitio web: %s"
@@ -6138,8 +6143,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "Agora %1$s segue as súas notas en %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6166,19 +6178,19 @@ msgstr ""
"notificación en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografía: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo enderezo de correo electrónico para publicar en %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6200,31 +6212,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmación dos SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s fíxolle un aceno"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6252,13 +6264,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensaxe privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6292,13 +6304,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) marcou a súa nota como favorita"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6337,7 +6349,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6348,13 +6360,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou unha nota á súa atención"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6701,7 +6713,7 @@ msgstr "Media diaria"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Aínda non se implantou o método."
@@ -6725,7 +6737,7 @@ msgstr "Salientadas"
msgid "Popular"
msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sen argumentos \"return-to\"."
@@ -6746,7 +6758,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revogarlle o rol \"%s\" a este usuario"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
@@ -6924,56 +6936,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "hai como %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "hai como %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "hai como %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "hai como %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "hai como un ano"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 486fc3285..09b597d2e 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:14+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:29+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -397,32 +397,32 @@ msgstr "עידכון המשתמש נכשל."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "שם משתמש לא חוקי."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "לאתר הבית יש כתובת לא חוקית."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
@@ -434,7 +434,7 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
@@ -529,12 +529,12 @@ msgstr "גודל לא חוקי."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -603,8 +603,8 @@ msgstr ""
msgid "Account"
msgstr "אודות"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -612,8 +612,8 @@ msgid "Nickname"
msgstr "כינוי"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "סיסמה"
@@ -831,12 +831,12 @@ msgstr "התמונה עודכנה."
msgid "You already blocked that user."
msgstr "כבר נכנסת למערכת!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "אין משתמש כזה."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -848,7 +848,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -858,7 +858,7 @@ msgstr "לא"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "אין משתמש כזה."
@@ -868,7 +868,7 @@ msgstr "אין משתמש כזה."
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -877,12 +877,12 @@ msgid "Yes"
msgstr "כן"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "אין משתמש כזה."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1051,7 +1051,7 @@ msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אות
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "לא מחובר."
@@ -1526,7 +1526,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1763,13 +1763,13 @@ msgstr "למשתמש אין פרופיל."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2311,51 +2311,51 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
msgid "%1$s left group %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "כבר מחובר."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "שם משתמש או סיסמה לא נכונים."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "זכור אותי"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "שכחת או איבדת את הסיסמה?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "שם המשתמש או הסיסמה לא חוקיים"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2696,7 +2696,7 @@ msgid "6 or more characters"
msgstr "לפחות 6 אותיות"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "אשר"
@@ -2708,11 +2708,11 @@ msgstr "זהה לסיסמה למעלה"
msgid "Change"
msgstr "שנה"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "הסיסמאות לא תואמות."
@@ -2947,44 +2947,44 @@ msgstr "פרופיל לא מוכר"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "שם מלא"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "אתר בית"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "ביוגרפיה"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "מיקום"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
@@ -3024,7 +3024,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
@@ -3274,7 +3274,7 @@ msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
msgid "Password and confirmation do not match."
msgstr "הסיסמה ואישורה אינן תואמות."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "שגיאה ביצירת שם המשתמש."
@@ -3282,101 +3282,101 @@ msgstr "שגיאה ביצירת שם המשתמש."
msgid "New password successfully saved. You are now logged in."
msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "שגיאה באישור הקוד."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "הירשם"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr ""
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "שם המשתמש או הסיסמה לא חוקיים"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr " לפחות 6 אותיות. שדה חובה."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr ""
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3395,7 +3395,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5601,14 +5601,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6107,8 +6107,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6129,19 +6136,19 @@ msgstr ""
" %4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "אודות: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6155,30 +6162,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6195,13 +6202,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6221,13 +6228,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6249,7 +6256,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6257,13 +6264,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6594,7 +6601,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6619,7 +6626,7 @@ msgstr ""
msgid "Popular"
msgstr "אנשים"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "אין מסמך כזה."
@@ -6643,7 +6650,7 @@ msgstr "אין הודעה כזו."
msgid "Revoke the \"%s\" role from this user"
msgstr "אין משתמש כזה."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6833,56 +6840,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "לפני כדקה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "לפני כשעה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "לפני כיום"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "לפני כחודש"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 8600eaf7d..defca6e33 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:17+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:32+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -381,32 +381,32 @@ msgstr ""
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Startowa strona njeje płaćiwy URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
@@ -418,7 +418,7 @@ msgstr "Wopisanje je předołho (maks. %d znamješkow)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -509,12 +509,12 @@ msgstr "Njepłaćiwy token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -579,8 +579,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -588,8 +588,8 @@ msgid "Nickname"
msgstr "Přimjeno"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hesło"
@@ -796,11 +796,11 @@ msgstr "Awatar zničeny."
msgid "You already blocked that user."
msgstr "Sy tutoho wužiwarja hižo zablokował."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Wužiwarja blokować"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -812,7 +812,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -821,7 +821,7 @@ msgstr "Ně"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Tutoho wužiwarja njeblokować"
@@ -830,7 +830,7 @@ msgstr "Tutoho wužiwarja njeblokować"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -838,11 +838,11 @@ msgid "Yes"
msgstr "Haj"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1000,7 +1000,7 @@ msgstr "Tutu aplikaciju zničić"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Njepřizjewjeny."
@@ -1442,7 +1442,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -1661,13 +1661,13 @@ msgstr "Wužiwar hižo ma tutu rólu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Žadyn profil podaty."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Žadyn profil z tym ID."
@@ -2179,49 +2179,49 @@ msgstr "Njejsy čłon teje skupiny."
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Hižo přizjewjeny."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Wopačne wužiwarske mjeno abo hesło."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Přizjewić"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Składować"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Hesło zhubjene abo zabyte?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2542,7 +2542,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/register.php:440
msgid "Confirm"
msgstr "Wobkrućić"
@@ -2554,11 +2554,11 @@ msgstr ""
msgid "Change"
msgstr "Změnić"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Hesło dyrbi 6 abo wjace znamješkow měć."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hesle so njekryjetej."
@@ -2778,43 +2778,43 @@ msgstr "Profilowe informacije"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Dospołne mjeno"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografija"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Městno"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2854,7 +2854,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografija je předołha (maks. %d znamješkow)."
@@ -3100,7 +3100,7 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3108,100 +3108,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Wodaj, njepłaćiwy přeprošenski kod."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registracija njedowolena."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-mejlowa adresa hižo eksistuje."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 abo wjace znamješkow. Trěbne."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Jenake kaž hesło horjeka. Trěbne."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mejl"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3220,7 +3220,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5288,14 +5288,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5777,8 +5777,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5794,19 +5801,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografija: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5820,30 +5827,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-wobkrućenje"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5860,13 +5867,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nowa priwatna powěsć wot %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5886,13 +5893,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5914,7 +5921,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5922,13 +5929,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6245,7 +6252,7 @@ msgstr ""
msgid "All groups"
msgstr "Wšě skupiny"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6269,7 +6276,7 @@ msgstr ""
msgid "Popular"
msgstr "Woblubowany"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Žane wróćenske argumenty."
@@ -6290,7 +6297,7 @@ msgstr "Tutu zdźělenku wospjetować"
msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6468,56 +6475,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 18617e5c5..409b38ab9 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:20+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:36+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -391,32 +391,32 @@ msgstr "Non poteva trovar le usator de destination."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Le pagina personal non es un URL valide."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
@@ -428,7 +428,7 @@ msgstr "Description es troppo longe (max %d charachteres)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Loco es troppo longe (max. 255 characteres)."
@@ -519,12 +519,12 @@ msgstr "Indicio invalide."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -597,8 +597,8 @@ msgstr ""
msgid "Account"
msgstr "Conto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -606,8 +606,8 @@ msgid "Nickname"
msgstr "Pseudonymo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Contrasigno"
@@ -818,11 +818,11 @@ msgstr "Avatar delite."
msgid "You already blocked that user."
msgstr "Tu ha ja blocate iste usator."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocar usator"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -837,7 +837,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -846,7 +846,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non blocar iste usator"
@@ -855,7 +855,7 @@ msgstr "Non blocar iste usator"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocar iste usator"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
@@ -1028,7 +1028,7 @@ msgstr "Deler iste application"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Non identificate."
@@ -1478,7 +1478,7 @@ msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
@@ -1705,13 +1705,13 @@ msgstr "Le usator ha ja iste rolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nulle profilo specificate."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Non existe un profilo con iste ID."
@@ -2279,42 +2279,42 @@ msgstr "Tu non es membro de iste gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Tu es ja identificate."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nomine de usator o contrasigno incorrecte."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Identificar te a iste sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Memorar me"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Aperir session automaticamente in le futuro; non pro computatores usate in "
"commun!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Contrasigno perdite o oblidate?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,11 +2322,11 @@ msgstr ""
"Pro motivos de securitate, per favor re-entra tu nomine de usator e "
"contrasigno ante de cambiar tu configurationes."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Aperi un session con tu nomine de usator e contrasigno."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2662,7 +2662,7 @@ msgid "6 or more characters"
msgstr "6 o plus characteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2674,11 +2674,11 @@ msgstr "Identic al contrasigno hic supra"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Le contrasigno debe haber al minus 6 characteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le contrasignos non corresponde."
@@ -2904,43 +2904,43 @@ msgstr "Information de profilo"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nomine complete"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Describe te e tu interesses in %d characteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Describe te e tu interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Bio"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Loco"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
@@ -2983,7 +2983,7 @@ msgid ""
msgstr ""
"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Bio es troppo longe (max %d chars)."
@@ -3244,7 +3244,7 @@ msgstr "Le contrasigno debe haber 6 characteres o plus."
msgid "Password and confirmation do not match."
msgstr "Contrasigno e confirmation non corresponde."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
@@ -3252,39 +3252,39 @@ msgstr "Error durante le configuration del usator."
msgid "New password successfully saved. You are now logged in."
msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Pardono, solmente le personas invitate pote registrar se."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Pardono, le codice de invitation es invalide."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registration non permittite."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Tu non pote crear un conto si tu non accepta le licentia."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Le adresse de e-mail existe ja."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3292,57 +3292,58 @@ msgstr ""
"Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
"notas e mitter te in contacto con amicos e collegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o plus characteres. Requirite."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Identic al contrasigno hic supra. Requirite."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Usate solmente pro actualisationes, notificationes e recuperation de "
"contrasigno"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Le contento e datos de %1$s es private e confidential."
+msgstr ""
+"io comprende que le contento e datos de %1$s es private e confidential."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Le derecto de autor pro mi texto e files es in possession de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Le derecto de autor pro mi texto e files resta in mi possession."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Tote le derectos reservate."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3352,7 +3353,7 @@ msgstr ""
"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
"telephono."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3384,7 +3385,7 @@ msgstr ""
"\n"
"Gratias pro inscriber te, e nos spera que iste servicio te place."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5571,14 +5572,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina personal: %s"
@@ -6112,8 +6113,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s seque ora tu notas in %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6139,19 +6147,19 @@ msgstr ""
"Cambia tu adresse de e-mail o optiones de notification a %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nove adresse de e-mail pro publicar in %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6173,30 +6181,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Stato de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s te ha pulsate"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6224,13 +6232,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nove message private de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6264,13 +6272,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha addite tu nota como favorite"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6309,7 +6317,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6320,13 +6328,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ha inviate un nota a tu attention"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6674,7 +6682,7 @@ msgstr "Media de cata die"
msgid "All groups"
msgstr "Tote le gruppos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Methodo non implementate."
@@ -6698,7 +6706,7 @@ msgstr "In evidentia"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Nulle parametro return-to."
@@ -6719,7 +6727,7 @@ msgstr "Repeter iste nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
@@ -6897,56 +6905,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 b3ced814d..416014714 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:24+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:39+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -399,32 +399,32 @@ msgstr ""
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Heimasíða er ekki gild vefslóð."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
@@ -436,7 +436,7 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
@@ -531,12 +531,12 @@ msgstr "Ótæk stærð."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -604,8 +604,8 @@ msgstr ""
msgid "Account"
msgstr "Aðgangur"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -613,8 +613,8 @@ msgid "Nickname"
msgstr "Stuttnefni"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lykilorð"
@@ -828,11 +828,11 @@ msgstr ""
msgid "You already blocked that user."
msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Loka á notanda"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -844,7 +844,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -854,7 +854,7 @@ msgstr "Nei"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Opna á þennan notanda"
@@ -864,7 +864,7 @@ msgstr "Opna á þennan notanda"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -873,11 +873,11 @@ msgid "Yes"
msgstr "Já"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Loka á þennan notanda"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
@@ -1043,7 +1043,7 @@ msgstr "Eyða þessu babli"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ekki innskráð(ur)."
@@ -1516,7 +1516,7 @@ msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
@@ -1754,13 +1754,13 @@ msgstr "Notandi hefur enga persónulega síðu."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Engin persónuleg síða tilgreind"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Engin persónulega síða með þessu einkenni"
@@ -2320,42 +2320,42 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
msgid "%1$s left group %2$s"
msgstr "%s gekk úr hópnum %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Rangt notendanafn eða lykilorð."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
"með þér!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tapað eða gleymt lykilorð?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2363,12 +2363,12 @@ msgstr ""
"Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
"lykilorð áður en þú breytir stillingunum þínum."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Skráðu þig inn með notendanafni og lykilorði"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2715,7 +2715,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/register.php:440
msgid "Confirm"
msgstr "Staðfesta"
@@ -2727,11 +2727,11 @@ msgstr "Sama og lykilorðið hér fyrir ofan"
msgid "Change"
msgstr "Breyta"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lykilorðin passa ekki saman."
@@ -2967,46 +2967,46 @@ msgstr "Upplýsingar á persónulegri síðu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt nafn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
"vefsvæði"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Lýstu þér og þínum "
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lýsing"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Staðsetning"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
@@ -3050,7 +3050,7 @@ msgstr ""
"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
"(best fyrir ómannlega notendur)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
@@ -3299,7 +3299,7 @@ msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
msgid "Password and confirmation do not match."
msgstr "Lykilorð og staðfesting passa ekki saman."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
@@ -3307,102 +3307,102 @@ msgstr "Villa kom upp í stillingu notanda."
msgid "New password successfully saved. You are now logged in."
msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Nýskráning ekki leyfð."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Tölvupóstfang er nú þegar skráð."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ótækt notendanafn eða lykilorð."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eða fleiri tákn. Nauðsynlegt"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Tölvupóstur"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3435,7 +3435,7 @@ msgstr ""
"\n"
"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5651,14 +5651,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimasíða: %s"
@@ -6149,8 +6149,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6166,7 +6173,7 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6174,13 +6181,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nýtt tölvupóstfang til að senda á %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6202,30 +6209,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Staða %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS staðfesting"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ýtti við þér"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6242,13 +6249,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ný persónuleg skilaboð frá %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6268,13 +6275,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s heldur upp á babl frá þér"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6296,7 +6303,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6304,13 +6311,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6637,7 +6644,7 @@ msgstr ""
msgid "All groups"
msgstr "Allir hópar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6661,7 +6668,7 @@ msgstr "Í sviðsljósinu"
msgid "Popular"
msgstr "Vinsælt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Ekkert einkenni gefið upp."
@@ -6685,7 +6692,7 @@ msgstr "Svara þessu babli"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6870,56 +6877,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 ed159ea92..c5eb4957a 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:28+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:43+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -395,7 +395,7 @@ msgstr "Impossibile trovare l'utente destinazione."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
@@ -403,26 +403,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "L'indirizzo della pagina web non è valido."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -434,7 +434,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -525,12 +525,12 @@ msgstr "Token non valido."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Soprannome"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Password"
@@ -819,11 +819,11 @@ msgstr "Immagine eliminata."
msgid "You already blocked that user."
msgstr "Hai già bloccato quell'utente."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blocca utente"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -838,7 +838,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -847,7 +847,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Non bloccare questo utente"
@@ -856,7 +856,7 @@ msgstr "Non bloccare questo utente"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -864,11 +864,11 @@ msgid "Yes"
msgstr "Sì"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blocca questo utente"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
@@ -1028,7 +1028,7 @@ msgstr "Elimina l'applicazione"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Accesso non effettuato."
@@ -1481,7 +1481,7 @@ msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
@@ -1709,13 +1709,13 @@ msgstr "L'utente ricopre già questo ruolo."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nessun profilo specificato."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Nessun profilo con quel ID."
@@ -2282,39 +2282,39 @@ msgstr "Non fai parte di quel gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Accesso già effettuato."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome utente o password non corretto."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Password persa o dimenticata?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2322,11 +2322,11 @@ msgstr ""
"Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e "
"la tua password prima di modificare le impostazioni."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Accedi con nome utente e password."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2661,7 +2661,7 @@ msgid "6 or more characters"
msgstr "6 o più caratteri"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Conferma"
@@ -2673,11 +2673,11 @@ msgstr "Stessa password di sopra"
msgid "Change"
msgstr "Modifica"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "La password deve essere di 6 o più caratteri."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Le password non corrispondono."
@@ -2904,43 +2904,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL della tua pagina web, blog o profilo su un altro sito"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descriviti assieme ai tuoi interessi in %d caratteri"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descrivi te e i tuoi interessi"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Ubicazione"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
@@ -2983,7 +2983,7 @@ msgstr ""
"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
"umani)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "La biografia è troppo lunga (max %d caratteri)."
@@ -3242,7 +3242,7 @@ msgstr "La password deve essere lunga almeno 6 caratteri."
msgid "Password and confirmation do not match."
msgstr "La password e la conferma non corrispondono."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
@@ -3250,39 +3250,39 @@ msgstr "Errore nell'impostare l'utente."
msgid "New password successfully saved. You are now logged in."
msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Solo le persone invitate possono registrarsi."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Codice di invito non valido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrati"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrazione non consentita."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Non puoi registrarti se non accetti la licenza."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Indirizzo email già esistente."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome utente o password non valido."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3291,56 +3291,57 @@ msgstr ""
"successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
"colleghi. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 o più caratteri; richiesta"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Stessa password di sopra; richiesta"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usata solo per aggiornamenti, annunci e recupero password"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
+msgstr ""
+"Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "I miei testi e i miei file sono copyright di %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "I miei testi e file restano sotto il mio diretto copyright."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Tutti i diritti riservati."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3350,7 +3351,7 @@ msgstr ""
"dati personali: password, indirizzo email, indirizzo messaggistica "
"istantanea e numero di telefono."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3384,7 +3385,7 @@ msgstr ""
"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
"servizio."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5572,14 +5573,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Pagina web: %s"
@@ -6117,8 +6118,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6144,19 +6152,19 @@ msgstr ""
"Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografia: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nuovo indirizzo email per inviare messaggi a %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6178,31 +6186,31 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "stato di %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Conferma SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
"%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s ti ha richiamato"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6230,13 +6238,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nuovo messaggio privato da %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6270,13 +6278,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6315,7 +6323,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6326,13 +6334,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) ti ha inviato un messaggio"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6680,7 +6688,7 @@ msgstr "Media giornaliera"
msgid "All groups"
msgstr "Tutti i gruppi"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Metodo non implementato"
@@ -6704,7 +6712,7 @@ msgstr "In evidenza"
msgid "Popular"
msgstr "Famosi"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Nessun argomento return-to."
@@ -6725,7 +6733,7 @@ msgstr "Ripeti questo messaggio"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nessun utente singolo definito per la modalità single-user."
@@ -6903,56 +6911,56 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 36b810524..1348e0ad9 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:31+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:46+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -396,7 +396,7 @@ msgstr "ターゲットユーザーを見つけられません。"
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
@@ -404,26 +404,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "有効なニックネームではありません。"
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "ホームページのURLが不適切です。"
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "フルネームが長すぎます。(255字まで)"
@@ -435,7 +435,7 @@ msgstr "記述が長すぎます。(最長140字)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "場所が長すぎます。(255字まで)"
@@ -527,12 +527,12 @@ msgstr "不正なトークン。"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -599,8 +599,8 @@ msgstr ""
msgid "Account"
msgstr "アカウント"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +608,8 @@ msgid "Nickname"
msgstr "ニックネーム"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "パスワード"
@@ -816,11 +816,11 @@ msgstr "アバターが削除されました。"
msgid "You already blocked that user."
msgstr "そのユーザはすでにブロック済みです。"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "ユーザをブロック"
-#: actions/block.php:130
+#: actions/block.php:138
#, fuzzy
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
@@ -836,7 +836,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -846,7 +846,7 @@ msgstr "No"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "このユーザをアンブロックする"
@@ -855,7 +855,7 @@ msgstr "このユーザをアンブロックする"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -864,11 +864,11 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "このユーザをブロックする"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "ブロック情報の保存に失敗しました。"
@@ -1029,7 +1029,7 @@ msgstr "このアプリケーションを削除"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "ログインしていません。"
@@ -1487,7 +1487,7 @@ msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効なメールアドレスではありません。"
@@ -1723,13 +1723,13 @@ msgstr "ユーザは既に黙っています。"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "プロファイル記述がありません。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "そのIDのプロファイルがありません。"
@@ -2300,39 +2300,39 @@ msgstr "あなたはそのグループのメンバーではありません。"
msgid "%1$s left group %2$s"
msgstr "%1$s はグループ %2$s に残りました。"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "既にログインしています。"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "ユーザ名またはパスワードが間違っています。"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "サイトへログイン"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "ログイン状態を保持"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "パスワードを紛失、忘れた?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2340,12 +2340,12 @@ msgstr ""
"セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
"て下さい。"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "ユーザ名とパスワードでログイン"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2682,7 +2682,7 @@ msgid "6 or more characters"
msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "パスワード確認"
@@ -2694,11 +2694,11 @@ msgstr "上と同じパスワード"
msgid "Change"
msgstr "変更"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "パスワードは6文字以上にする必要があります。"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "パスワードが一致しません。"
@@ -2924,43 +2924,43 @@ msgstr "プロファイル情報"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "フルネーム"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "%d字以内で自分自身と自分の興味について書いてください"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "自分自身と自分の興味について書いてください"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自己紹介"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "場所"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "自分のいる場所。例:「都市, 都道府県 (または地域), 国」"
@@ -3002,7 +3002,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自己紹介が長すぎます (最長140文字)。"
@@ -3263,7 +3263,7 @@ msgstr "パスワードは6字以上でなければいけません。"
msgid "Password and confirmation do not match."
msgstr "パスワードと確認が一致しません。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "ユーザ設定エラー"
@@ -3271,39 +3271,39 @@ msgstr "ユーザ設定エラー"
msgid "New password successfully saved. You are now logged in."
msgstr "新しいパスワードの保存に成功しました。ログインしています。"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "すみません、招待された人々だけが登録できます。"
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "すみません、不正な招待コード。"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "登録成功"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "登録は許可されていません。"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "ライセンスに同意頂けない場合は登録できません。"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "メールアドレスが既に存在します。"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "不正なユーザ名またはパスワード。"
-#: actions/register.php:343
+#: actions/register.php:350
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -3312,63 +3312,63 @@ msgstr ""
"このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
"同僚にリンクできます。 "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6文字以上。必須です。"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "上のパスワードと同じです。 必須。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "メール"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "長い名前"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号"
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3401,7 +3401,7 @@ msgstr ""
"参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
"で使ってくれることを願っています。"
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5628,14 +5628,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "ホームページ: %s"
@@ -6125,8 +6125,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6152,19 +6159,19 @@ msgstr ""
"%8$s でメールアドレスか通知オプションを変えてください。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "自己紹介: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s へ投稿のための新しいメールアドレス"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, fuzzy, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6186,30 +6193,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s の状態"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS確認"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "この電話番号は確認待ちです。"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "あなたは %s に合図されています"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6237,13 +6244,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s からの新しいプライベートメッセージ"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, fuzzy, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6277,13 +6284,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6322,7 +6329,7 @@ msgstr ""
"%6%s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6330,13 +6337,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6669,7 +6676,7 @@ msgstr ""
msgid "All groups"
msgstr "全てのグループ"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "未実装のメソッド。"
@@ -6693,7 +6700,7 @@ msgstr "フィーチャーされた"
msgid "Popular"
msgstr "人気"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "return-to 引数がありません。"
@@ -6714,7 +6721,7 @@ msgstr "このつぶやきを繰り返す"
msgid "Revoke the \"%s\" role from this user"
msgstr "このグループからこのユーザをブロック"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "single-user モードのためのシングルユーザが定義されていません。"
@@ -6896,56 +6903,56 @@ msgid "Moderator"
msgstr "管理"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "数秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "約 1 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "約 1 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "約 1 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "約 1 ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index bd688f756..6d74052fd 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:35+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:49+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -383,7 +383,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
@@ -391,26 +391,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "유효한 별명이 아닙니다"
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "홈페이지 주소형식이 올바르지 않습니다."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -422,7 +422,7 @@ msgstr "설명이 너무 깁니다. (최대 %d 글자)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -515,12 +515,12 @@ msgstr "옳지 않은 크기"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -589,8 +589,8 @@ msgstr ""
msgid "Account"
msgstr "계정"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -598,8 +598,8 @@ msgid "Nickname"
msgstr "별명"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "비밀 번호"
@@ -807,11 +807,11 @@ msgstr "아바타가 삭제되었습니다."
msgid "You already blocked that user."
msgstr "이미 차단된 이용자입니다."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "사용자를 차단합니다."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -825,7 +825,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -835,7 +835,7 @@ msgstr "아니오"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "이용자를 차단하지 않는다."
@@ -844,7 +844,7 @@ msgstr "이용자를 차단하지 않는다."
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -853,11 +853,11 @@ msgid "Yes"
msgstr "네, 맞습니다."
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "이 사용자 차단하기"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
@@ -1022,7 +1022,7 @@ msgstr "이 게시글 삭제하기"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "로그인하고 있지 않습니다."
@@ -1491,7 +1491,7 @@ msgid "Cannot normalize that email address"
msgstr "그 이메일 주소를 정규화 할 수 없습니다."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "유효한 이메일 주소가 아닙니다."
@@ -1726,13 +1726,13 @@ msgstr "회원이 당신을 차단해왔습니다."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "프로필을 지정하지 않았습니다."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "해당 ID의 프로필이 없습니다."
@@ -2294,52 +2294,52 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
msgid "%1$s left group %2$s"
msgstr "%s가 그룹%s를 떠났습니다."
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "이미 로그인 하셨습니다."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "틀린 계정 또는 비밀 번호"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "사이트에 로그인하세요."
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "자동 로그인"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "비밀 번호를 잊으셨나요?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "사용자 이름과 비밀번호로 로그인"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2683,7 +2683,7 @@ msgid "6 or more characters"
msgstr "6글자 이상"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "인증"
@@ -2695,11 +2695,11 @@ msgstr "위와 같은 비밀 번호"
msgid "Change"
msgstr "변환"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6자리 이상이어야 합니다."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "비밀 번호가 일치하지 않습니다."
@@ -2936,44 +2936,44 @@ msgstr "프로필 정보"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "실명"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페이지"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "140자 이내에서 자기 소개"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "당신에 대해 소개해주세요."
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "자기소개"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "위치"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
@@ -3013,7 +3013,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "나에게 구독하는 사람에게 자동 구독 신청"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "자기소개가 너무 깁니다. (최대 140글자)"
@@ -3264,7 +3264,7 @@ msgstr "비밀 번호는 6자 이상이어야 합니다."
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "사용자 세팅 오류"
@@ -3273,103 +3273,103 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "확인 코드 오류"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "회원가입"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "가입이 허용되지 않습니다."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "이메일 주소가 이미 존재 합니다."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
"입력."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6글자 이상이 필요합니다."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "이메일"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "더욱 긴 이름을 요구합니다."
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3402,7 +3402,7 @@ msgstr ""
"\n"
"다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5623,14 +5623,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "홈페이지: %s"
@@ -6119,8 +6119,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6140,7 +6147,7 @@ msgstr ""
"그럼 이만,%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6148,13 +6155,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%s에 포스팅 할 새로운 이메일 주소"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6170,30 +6177,30 @@ msgstr ""
"오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s 상태"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS 인증"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "이 전화 번호는 인증 대기중입니다."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 사용자가 찔러 봤습니다."
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6210,13 +6217,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6236,13 +6243,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6264,7 +6271,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6272,13 +6279,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6607,7 +6614,7 @@ msgstr ""
msgid "All groups"
msgstr "모든 그룹"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6631,7 +6638,7 @@ msgstr "피쳐링됨"
msgid "Popular"
msgstr "인기있는"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "id 인자가 없습니다."
@@ -6655,7 +6662,7 @@ msgstr "이 게시글에 대해 답장하기"
msgid "Revoke the \"%s\" role from this user"
msgstr "이 그룹의 회원리스트"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6845,56 +6852,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 2f4fca471..88a8eb4ac 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:38+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:53+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -398,32 +398,32 @@ msgstr "Не можев да го пронајдам целниот корисн
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Неправилен прекар."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Главната страница не е важечка URL-адреса."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Целото име е предолго (максимум 255 знаци)"
@@ -435,7 +435,7 @@ msgstr "Описот е предолг (дозволено е највеќе %d
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Локацијата е предолга (максимумот е 255 знаци)."
@@ -526,12 +526,12 @@ msgstr "Погрешен жетон."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -601,8 +601,8 @@ msgstr ""
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -610,8 +610,8 @@ msgid "Nickname"
msgstr "Прекар"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Лозинка"
@@ -821,11 +821,11 @@ msgstr "Аватарот е избришан."
msgid "You already blocked that user."
msgstr "Веќе го имате блокирано тој корисник."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокирај корисник"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -841,7 +841,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -850,7 +850,7 @@ msgstr "Не"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не го блокирај корисников"
@@ -859,7 +859,7 @@ msgstr "Не го блокирај корисников"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -867,11 +867,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокирај го корисников"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Не можев да ги снимам инофрмациите за блокот."
@@ -1032,7 +1032,7 @@ msgstr "Избриши го програмов"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Не сте најавени."
@@ -1484,7 +1484,7 @@ msgid "Cannot normalize that email address"
msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилна адреса за е-пошта."
@@ -1712,13 +1712,13 @@ msgstr "Корисникот веќе ја има таа улога."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Нема назначено профил."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Нема профил со тоа ID."
@@ -2289,41 +2289,41 @@ msgstr "Не членувате во таа група."
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Веќе сте најавени."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Неточно корисничко име или лозинка"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Најава"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Најавете се"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Следниот пат најавете се автоматски; не е за компјутери кои ги делите со "
"други!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Ја загубивте или заборавивте лозинката?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2331,11 +2331,11 @@ msgstr ""
"Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
"име и лозинка пред да ги смените Вашите нагодувања."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Најавете се со корисничко име и лозинка."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2671,7 +2671,7 @@ msgid "6 or more characters"
msgstr "6 или повеќе знаци"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Потврди"
@@ -2683,11 +2683,11 @@ msgstr "Исто како лозинката погоре"
msgid "Change"
msgstr "Промени"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Лозинката мора да содржи барем 6 знаци."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Лозинките не се совпаѓаат."
@@ -2914,43 +2914,43 @@ msgstr "Информации за профил"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Цело име"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна страница"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL на Вашата домашна страница, блог или профил на друга веб-страница."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишете се себеси и своите интереси во %d знаци."
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишете се себеси и Вашите интереси"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Биографија"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Локација"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
@@ -2994,7 +2994,7 @@ msgstr ""
"Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за "
"ботови и сл.)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Биографијата е преголема (највеќе до %d знаци)."
@@ -3257,7 +3257,7 @@ msgstr "Лозинката мора да биде од најмалку 6 зна
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не се совпаѓаат."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Грешка во поставувањето на корисникот."
@@ -3265,39 +3265,39 @@ msgstr "Грешка во поставувањето на корисникот."
msgid "New password successfully saved. You are now logged in."
msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Жалиме, регистрацијата е само со покана."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Жалиме, неважечки код за поканата."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Регистрацијата е успешна"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Регистрирањето не е дозволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Адресата веќе постои."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Погрешно име или лозинка."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3305,57 +3305,59 @@ msgstr ""
"Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
"објавувате забелешки и да се поврзувате со пријатели и колеги. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
"Задолжително поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Барем 6 знаци. Задолжително поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Исто што и лозинката погоре. Задолжително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Е-пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Подолго име, по можност Вашето вистинско име и презиме"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Содржината и податоците на %1$s се лични и доверливи."
+msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
+"Јас ја задржувам сопственоста на авторското право врз мојот текст и "
+"податотеки."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Сите права задржани."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3364,7 +3366,7 @@ msgstr ""
"Мојот текст и податотеки се достапни под %s, освен следниве приватни "
"податоци: лозинка, е-пошта, IM-адреса и телефонски број."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3398,7 +3400,7 @@ msgstr ""
"Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
"служба."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5593,14 +5595,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашна страница: %s"
@@ -6135,8 +6137,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s сега ги следи Вашите забелешки на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6163,19 +6172,19 @@ msgstr ""
"$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Биографија: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Нова е-поштенска адреса за објавување на %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6197,30 +6206,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Статус на %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Потврда за СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: потврдете го како свој телефонскиов број со следниов код:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s Ве подбуцна"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6248,13 +6257,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Нова приватна порака од %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6288,13 +6297,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додаде Ваша забелешка како омилена"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6333,7 +6342,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6344,13 +6353,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) Ви испрати забелешка што сака да ја прочитате"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6701,7 +6710,7 @@ msgstr "Дневен просек"
msgid "All groups"
msgstr "Сите групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Неимплементиран метод."
@@ -6725,7 +6734,7 @@ msgstr "Избрани"
msgid "Popular"
msgstr "Популарно"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Нема return-to аргументи."
@@ -6746,7 +6755,7 @@ msgstr "Повтори ја забелешкава"
msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на корисников"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Не е зададен корисник за еднокорисничкиот режим."
@@ -6924,56 +6933,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пред неколку секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "пред еден час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "пред еден месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5e5539e57..c53a64169 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:41+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:56+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -393,32 +393,32 @@ msgstr "Kunne ikke finne målbruker."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Beklager, navnet er for langt (max 250 tegn)."
@@ -430,7 +430,7 @@ msgstr "Beskrivelsen er for lang (maks %d tegn)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Plassering er for lang (maks 255 tegn)."
@@ -521,12 +521,12 @@ msgstr "Ugyldig symbol."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -594,8 +594,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -603,8 +603,8 @@ msgid "Nickname"
msgstr "Nick"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -810,11 +810,11 @@ msgstr "Avatar slettet."
msgid "You already blocked that user."
msgstr "Du har allerede blokkert den brukeren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukeren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -829,7 +829,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -838,7 +838,7 @@ msgstr "Nei"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Ikke blokker denne brukeren"
@@ -847,7 +847,7 @@ msgstr "Ikke blokker denne brukeren"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -855,11 +855,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokker denne brukeren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
@@ -1020,7 +1020,7 @@ msgstr "Slett dette programmet"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikke logget inn."
@@ -1468,7 +1468,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
@@ -1695,13 +1695,13 @@ msgstr "Bruker har allerede denne rollen."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil oppgitt."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med den ID'en."
@@ -2258,40 +2258,40 @@ msgstr "Du er ikke et medlem av den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allerede innlogget."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn på nettstedet"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mistet eller glemt passordet?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2299,11 +2299,11 @@ msgstr ""
"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
"endrer innstillingene dine."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logg inn med brukernavn og passord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2637,7 +2637,7 @@ msgid "6 or more characters"
msgstr "6 eller flere tegn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekreft"
@@ -2649,11 +2649,11 @@ msgstr "Samme som passord ovenfor"
msgid "Change"
msgstr "Endre"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 tegn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passordene var ikke like."
@@ -2877,43 +2877,43 @@ msgstr "Profilinformasjon"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt navn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv degselv og dine interesser med %d tegn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv degselv og dine interesser"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
@@ -2956,7 +2956,7 @@ msgid ""
msgstr ""
"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks %d tegn)."
@@ -3217,7 +3217,7 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
msgid "Password and confirmation do not match."
msgstr "Passord og bekreftelse samsvarer ikke."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Feil ved innstilling av bruker."
@@ -3225,39 +3225,39 @@ msgstr "Feil ved innstilling av bruker."
msgid "New password successfully saved. You are now logged in."
msgstr "Nytt passord ble lagret. Du er nå logget inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Beklager, kun inviterte personer kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Beklager, ugyldig invitasjonskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registrering vellykket"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrer"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering ikke tillatt."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-postadressen finnes allerede."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3265,56 +3265,56 @@ msgstr ""
"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
"knytte deg til venner og kollegaer. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eller flere tegn. Påkrevd."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samme som passord over. Kreves."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3323,7 +3323,7 @@ msgstr ""
"Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3356,7 +3356,7 @@ msgstr ""
"\n"
"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5502,14 +5502,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hjemmeside: %s"
@@ -6004,8 +6004,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lytter nå til dine notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6031,19 +6038,19 @@ msgstr ""
"Endre e-postadressen din eller dine varslingsvalg på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadresse for posting til %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6065,30 +6072,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt knuffet av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6116,13 +6123,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6156,13 +6163,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s /@%s) la din notis til som en favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6200,7 +6207,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6211,13 +6218,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6562,7 +6569,7 @@ msgstr "Daglig gjennomsnitt"
msgid "All groups"
msgstr "Alle grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Ikke-implementert metode."
@@ -6587,7 +6594,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6608,7 +6615,7 @@ msgstr "Repeter denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6791,56 +6798,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 2fb17c45f..0e9304401 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:48+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:08+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -399,7 +399,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
@@ -407,27 +407,27 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ongeldige gebruikersnaam!"
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "De thuispagina is geen geldige URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -439,7 +439,7 @@ msgstr "De beschrijving is te lang (maximaal %d tekens)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Locatie is te lang (maximaal 255 tekens)."
@@ -530,12 +530,12 @@ msgstr "Ongeldig token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -611,8 +611,8 @@ msgstr ""
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -620,8 +620,8 @@ msgid "Nickname"
msgstr "Gebruikersnaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Wachtwoord"
@@ -831,11 +831,11 @@ msgstr "De avatar is verwijderd."
msgid "You already blocked that user."
msgstr "U hebt deze gebruiker reeds geblokkeerd."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Gebruiker blokkeren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -850,7 +850,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -859,7 +859,7 @@ msgstr "Nee"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Gebruiker niet blokkeren"
@@ -868,7 +868,7 @@ msgstr "Gebruiker niet blokkeren"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -876,11 +876,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
@@ -1041,7 +1041,7 @@ msgstr "Deze applicatie verwijderen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Niet aangemeld."
@@ -1493,7 +1493,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
@@ -1726,13 +1726,13 @@ msgstr "Deze gebruiker heeft deze rol al."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Er is geen profiel opgegeven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Er is geen profiel met dat ID."
@@ -2306,41 +2306,41 @@ msgstr "U bent geen lid van deze groep"
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U bent al aangemeld."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "De gebruikersnaam of wachtwoord is onjuist."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Wachtwoord kwijt of vergeten?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2348,11 +2348,11 @@ msgstr ""
"Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
"invoeren alvorens u uw instellingen kunt wijzigen."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2691,7 +2691,7 @@ msgid "6 or more characters"
msgstr "Zes of meer tekens"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bevestigen"
@@ -2703,11 +2703,11 @@ msgstr "Gelijk aan het wachtwoord hierboven"
msgid "Change"
msgstr "Wijzigen"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Het wachtwoord moet zes of meer tekens bevatten."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "De wachtwoorden komen niet overeen."
@@ -2934,43 +2934,43 @@ msgstr "Profielinformatie"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Volledige naam"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beschrijf uzelf en uw interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Beschrijving"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Locatie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
@@ -3014,7 +3014,7 @@ msgstr ""
"Automatisch abonneren bij abonnement op mij (beste voor automatische "
"processen)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "De beschrijving is te lang (maximaal %d tekens)."
@@ -3283,7 +3283,7 @@ msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
msgid "Password and confirmation do not match."
msgstr "Het wachtwoord en de bevestiging komen niet overeen."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
@@ -3291,39 +3291,39 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
msgid "New password successfully saved. You are now logged in."
msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Sorry. De uitnodigingscode is ongeldig."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registratie is niet toegestaan."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Het e-mailadres bestaat al."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3331,55 +3331,56 @@ msgstr ""
"Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u "
"mededelingen uitsturen en contact maken met vrienden en collega's. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Zes of meer tekens. Verplicht"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
+msgstr ""
+"Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Voor mijn teksten en bestanden rust het auteursrecht bij %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Alle rechten voorbehouden."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3389,7 +3390,7 @@ msgstr ""
"behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
"telefoonnummer."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3423,7 +3424,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5637,14 +5638,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Thuispagina: %s"
@@ -6187,8 +6188,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s volgt nu uw berichten %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6214,19 +6222,19 @@ msgstr ""
"Wijzig uw e-mailadres of instellingen op %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Beschrijving: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6248,30 +6256,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bevestiging"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bevestig dat u deze telefoon bezit met deze code:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s heeft u gepord"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6300,13 +6308,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "U hebt een nieuw privébericht van %s."
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6341,13 +6349,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6386,7 +6394,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6397,13 +6405,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) heeft u een mededeling gestuurd"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6755,7 +6763,7 @@ msgstr "Dagelijks gemiddelde"
msgid "All groups"
msgstr "Alle groepen"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Methode niet geïmplementeerd."
@@ -6779,7 +6787,7 @@ msgstr "Uitgelicht"
msgid "Popular"
msgstr "Populair"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
@@ -6800,7 +6808,7 @@ msgstr "Deze mededeling herhalen"
msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
@@ -6978,56 +6986,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 f1437b8aa..d955b3698 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:45+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:37:59+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -401,32 +401,32 @@ msgstr "Kan ikkje finna einkvan status."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -438,7 +438,7 @@ msgstr "skildringa er for lang (maks 140 teikn)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -533,12 +533,12 @@ msgstr "Ugyldig storleik."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -606,8 +606,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "Kallenamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Passord"
@@ -832,11 +832,11 @@ msgstr "Lasta opp brukarbilete."
msgid "You already blocked that user."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blokker brukaren"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -848,7 +848,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -858,7 +858,7 @@ msgstr "Nei"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Lås opp brukaren"
@@ -868,7 +868,7 @@ msgstr "Lås opp brukaren"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -877,11 +877,11 @@ msgid "Yes"
msgstr "Jau"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blokkér denne brukaren"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
@@ -1049,7 +1049,7 @@ msgstr "Slett denne notisen"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikkje logga inn"
@@ -1532,7 +1532,7 @@ msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
@@ -1770,13 +1770,13 @@ msgstr "Brukar har blokkert deg."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen vald profil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Fann ingen profil med den IDen."
@@ -2343,40 +2343,40 @@ msgstr "Du er ikkje medlem av den gruppa."
msgid "%1$s left group %2$s"
msgstr "%s forlot %s gruppa"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allereie logga inn."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Feil brukarnamn eller passord"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mista eller gløymd passord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2384,12 +2384,12 @@ msgstr ""
"Skriv inn brukarnam og passord før du endrar innstillingar (av "
"tryggleiksomsyn)."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Log inn med brukarnamn og passord."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2736,7 +2736,7 @@ msgid "6 or more characters"
msgstr "6 eller fleire teikn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Godta"
@@ -2748,11 +2748,11 @@ msgstr "Samme passord som over"
msgid "Change"
msgstr "Endra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 teikn."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Passorda var ikkje like."
@@ -2989,44 +2989,44 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Skriv om deg og interessene dine med 140 teikn"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Skildra deg sjølv og din"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Om meg"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plassering"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
@@ -3069,7 +3069,7 @@ msgid ""
msgstr ""
"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "«Om meg» er for lang (maks 140 "
@@ -3321,7 +3321,7 @@ msgstr "Passord må vera 6 tekn eller meir."
msgid "Password and confirmation do not match."
msgstr "Passord og stadfesting stemmer ikkje."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
@@ -3329,97 +3329,97 @@ msgstr "Feil ved å setja brukar."
msgid "New password successfully saved. You are now logged in."
msgstr "Lagra det nye passordet. Du er logga inn."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Beklage, men kun inviterte kan registrere seg."
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Feil med stadfestingskode."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering ikkje tillatt."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Epostadressa finst allereie."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ugyldig brukarnamn eller passord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
"Kravd."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 eller fleire teikn. Kravd."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Epost"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3428,7 +3428,7 @@ msgstr ""
" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
"telefonnummer."
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3460,7 +3460,7 @@ msgstr ""
"\n"
"Takk for at du blei med, og vi håpar du vil lika tenesta!"
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5692,14 +5692,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Heimeside: %s"
@@ -6190,8 +6190,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s høyrer no på notisane dine på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6213,7 +6220,7 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6221,13 +6228,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny epostadresse for å oppdatera %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6248,30 +6255,30 @@ msgstr ""
"Helsing frå %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Ventar på godkjenning for dette telefonnummeret."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blitt dulta av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6288,13 +6295,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Ny privat melding fra %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6314,13 +6321,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s la til di melding som ein favoritt"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6342,7 +6349,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6350,13 +6357,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6685,7 +6692,7 @@ msgstr ""
msgid "All groups"
msgstr "Alle gruppar"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6709,7 +6716,7 @@ msgstr "Framheva"
msgid "Popular"
msgstr "Populære"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Manglar argumentet ID."
@@ -6733,7 +6740,7 @@ msgstr "Svar på denne notisen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ei liste over brukarane i denne gruppa."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6923,56 +6930,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 a6082d4f1..4d4c85c3a 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:51+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:11+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -400,32 +400,32 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Pseudonim jest już używany. Spróbuj innego."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Strona domowa nie jest prawidłowym adresem URL."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
@@ -437,7 +437,7 @@ msgstr "Opis jest za długi (maksymalnie %d znaków)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -528,12 +528,12 @@ msgstr "Nieprawidłowy token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -602,8 +602,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Pseudonim"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Hasło"
@@ -818,11 +818,11 @@ msgstr "Usunięto awatar."
msgid "You already blocked that user."
msgstr "Użytkownik jest już zablokowany."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Zablokuj użytkownika"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -837,7 +837,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -846,7 +846,7 @@ msgstr "Nie"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Nie blokuj tego użytkownika"
@@ -855,7 +855,7 @@ msgstr "Nie blokuj tego użytkownika"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -863,11 +863,11 @@ msgid "Yes"
msgstr "Tak"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
@@ -1027,7 +1027,7 @@ msgstr "Usuń tę aplikację"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Niezalogowany."
@@ -1475,7 +1475,7 @@ msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
@@ -1703,13 +1703,13 @@ msgstr "Użytkownik ma już tę rolę."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Nie podano profilu."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Brak profilu o tym identyfikatorze."
@@ -2272,41 +2272,41 @@ msgstr "Nie jesteś członkiem tej grupy."
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Niepoprawna nazwa użytkownika lub hasło."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Zaloguj się na witrynie"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
"wiele osób."
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Zgubione lub zapomniane hasło?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2314,11 +2314,11 @@ msgstr ""
"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
"zmienianiem ustawień."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2650,7 +2650,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/register.php:440
msgid "Confirm"
msgstr "Potwierdź"
@@ -2662,11 +2662,11 @@ msgstr "Takie samo jak powyższe hasło"
msgid "Change"
msgstr "Zmień"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Hasło musi mieć sześć lub więcej znaków."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Hasła nie pasują do siebie."
@@ -2893,43 +2893,43 @@ msgstr "Informacje o profilu"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Imię i nazwisko"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Opisz się i swoje zainteresowania w %d znakach"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Opisz się i swoje zainteresowania"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "O mnie"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Położenie"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
@@ -2972,7 +2972,7 @@ msgid ""
msgstr ""
"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Wpis \"O mnie\" jest za długi (maksymalnie %d znaków)."
@@ -3233,7 +3233,7 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
msgid "Password and confirmation do not match."
msgstr "Hasło i potwierdzenie nie pasują do siebie."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
@@ -3241,40 +3241,40 @@ msgstr "Błąd podczas ustawiania użytkownika."
msgid "New password successfully saved. You are now logged in."
msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tylko zaproszone osoby mogą się rejestrować."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Nieprawidłowy kod zaproszenia."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Rejestracja nie jest dozwolona."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Adres e-mail już istnieje."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3282,56 +3282,56 @@ msgstr ""
"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
"wpisy i połączyć się z przyjaciółmi i kolegami. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 lub więcej znaków. Wymagane."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Takie samo jak powyższe hasło. Wymagane."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Treść i dane %1$s są prywatne i poufne."
+msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Moje teksty i pliki są objęte prawami autorskimi %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Wszystkie prawa zastrzeżone."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3340,7 +3340,7 @@ msgstr ""
"Tekst i pliki są dostępne na warunkach licencji %s, poza tymi prywatnymi "
"danymi: hasło, adres e-mail, adres komunikatora i numer telefonu."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3373,7 +3373,7 @@ msgstr ""
"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
"sprawi ci przyjemność."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5567,14 +5567,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Strona domowa: %s"
@@ -6114,8 +6114,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6141,19 +6148,19 @@ msgstr ""
"Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "O mnie: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Nowy adres e-mail do wysyłania do %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6175,30 +6182,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Stan użytkownika %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Potwierdzenie SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: proszę potwierdzić własny numer telefonu za pomocą tego kodu:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Zostałeś szturchnięty przez %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6226,13 +6233,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nowa prywatna wiadomość od użytkownika %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6266,13 +6273,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6311,7 +6318,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6322,13 +6329,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6674,7 +6681,7 @@ msgstr "Dziennie średnio"
msgid "All groups"
msgstr "Wszystkie grupy"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Niezaimplementowana metoda."
@@ -6698,7 +6705,7 @@ msgstr "Znane"
msgid "Popular"
msgstr "Popularne"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Brak parametrów powrotu."
@@ -6719,7 +6726,7 @@ msgstr "Powtórz ten wpis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Unieważnij rolę \"%s\" tego użytkownika"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
@@ -6898,56 +6905,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 f1368936a..4f40435bd 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:55+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:15+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -393,32 +393,32 @@ msgstr "Não foi possível encontrar o utilizador de destino."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Utilizador já é usado. Tente outro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Utilizador não é válido."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Página de ínicio não é uma URL válida."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -430,7 +430,7 @@ msgstr "Descrição demasiado longa (máx. 140 caracteres)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -521,12 +521,12 @@ msgstr "Chave inválida."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -594,8 +594,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -603,8 +603,8 @@ msgid "Nickname"
msgstr "Utilizador"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
@@ -810,11 +810,11 @@ msgstr "Avatar apagado."
msgid "You already blocked that user."
msgstr "Já bloqueou esse utilizador."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear utilizador"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -829,7 +829,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -838,7 +838,7 @@ msgstr "Não"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este utilizador"
@@ -847,7 +847,7 @@ msgstr "Não bloquear este utilizador"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -855,11 +855,11 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este utilizador"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
@@ -1020,7 +1020,7 @@ msgstr "Apagar esta aplicação"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Não iniciou sessão."
@@ -1474,7 +1474,7 @@ msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
@@ -1701,13 +1701,13 @@ msgstr "O utilizador já tem esta função."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado um perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado um perfil com essa identificação."
@@ -2274,41 +2274,41 @@ msgstr "Não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sessão já foi iniciada."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de utilizador ou senha incorrectos."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
"partilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu-se da senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2316,11 +2316,11 @@ msgstr ""
"Por razões de segurança, por favor re-introduza o seu nome de utilizador e "
"senha antes de alterar as configurações."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Iniciar sessão com um nome de utilizador e senha."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2651,7 +2651,7 @@ msgid "6 or more characters"
msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Confirmação"
@@ -2663,11 +2663,11 @@ msgstr "Repita a senha nova"
msgid "Change"
msgstr "Modificar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Senhas não coincidem."
@@ -2893,43 +2893,43 @@ msgstr "Informação do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva-se e aos seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografia"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localidade"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
@@ -2971,7 +2971,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografia demasiado extensa (máx. %d caracteres)."
@@ -3236,7 +3236,7 @@ msgstr "Senha tem de ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
@@ -3244,39 +3244,39 @@ msgstr "Erro ao configurar utilizador."
msgid "New password successfully saved. You are now logged in."
msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, só pessoas convidadas se podem registar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, código de convite inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registo não é permitido."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Não se pode registar se não aceita a licença."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Correio electrónico já existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome de utilizador ou senha inválidos."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3284,56 +3284,60 @@ msgstr ""
"Com este formulário pode criar uma conta nova. Poderá então publicar notas e "
"ligar-se a amigos e colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 ou mais caracteres. Obrigatório."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Repita a senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Correio"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para actualizações, anúncios e recuperação da senha"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
+msgstr ""
+"Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
+"Os meus textos e ficheiros estão protegidos pelos direitos de autor de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
+"Os meus textos e ficheiros permanecem protegidos pelos meus próprios "
+"direitos de autor."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Todos os direitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3343,7 +3347,7 @@ msgstr ""
"estes dados privados: senha, endereço de correio electrónico, endereço de "
"mensageiro instantâneo, número de telefone."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3376,7 +3380,7 @@ msgstr ""
"\n"
"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5564,14 +5568,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Página pessoal: %s"
@@ -6104,8 +6108,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s está agora a ouvir as suas notas em %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6132,19 +6143,19 @@ msgstr ""
"8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Bio: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço electrónico para publicar no site %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6166,30 +6177,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmação SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: confirme que este número de telefone é seu com este código:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s envia-lhe um toque"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6217,13 +6228,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem privada de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6257,13 +6268,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) adicionou a sua nota às favoritas."
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6301,7 +6312,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6312,13 +6323,13 @@ msgstr ""
"\n"
"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma nota à sua atenção"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6667,7 +6678,7 @@ msgstr "Média diária"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6691,7 +6702,7 @@ msgstr "Destaques"
msgid "Popular"
msgstr "Populares"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sem argumentos return-to."
@@ -6712,7 +6723,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Retirar a função \"%s\" a este utilizador"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nenhum utilizador único definido para o modo de utilizador único."
@@ -6890,56 +6901,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 a464b0cae..250df50db 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:40:58+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:18+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -398,7 +398,7 @@ msgstr "Não foi possível encontrar usuário de destino."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"A identificação deve conter apenas letras minúsculas e números e não pode "
@@ -406,26 +406,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Esta identificação já está em uso. Tente outro."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Não é uma identificação válida."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "A URL informada não é válida."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Nome completo muito extenso (máx. 255 caracteres)"
@@ -437,7 +437,7 @@ msgstr "Descrição muito extensa (máximo %d caracteres)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Localização muito extensa (máx. 255 caracteres)."
@@ -528,12 +528,12 @@ msgstr "Token inválido."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -607,8 +607,8 @@ msgstr ""
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -616,8 +616,8 @@ msgid "Nickname"
msgstr "Usuário"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Senha"
@@ -824,11 +824,11 @@ msgstr "O avatar foi excluído."
msgid "You already blocked that user."
msgstr "Você já bloqueou esse usuário."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloquear usuário"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -844,7 +844,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -853,7 +853,7 @@ msgstr "Não"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Não bloquear este usuário"
@@ -862,7 +862,7 @@ msgstr "Não bloquear este usuário"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -870,11 +870,11 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Bloquear este usuário"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
@@ -1035,7 +1035,7 @@ msgstr "Excluir esta aplicação"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Você não está autenticado."
@@ -1488,7 +1488,7 @@ msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
@@ -1717,13 +1717,13 @@ msgstr "O usuário já possui este papel."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Não foi especificado nenhum perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Não foi encontrado nenhum perfil com esse ID."
@@ -2293,42 +2293,42 @@ msgstr "Você não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Já está autenticado."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Nome de usuário e/ou senha incorreto(s)."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erro na configuração do usuário. Você provavelmente não tem autorização."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Entra automaticamente da próxima vez, sem pedir a senha. Não use em "
"computadores compartilhados!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Perdeu ou esqueceu sua senha?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2336,11 +2336,11 @@ msgstr ""
"Por razões de segurança, por favor, digite novamente seu nome de usuário e "
"senha antes de alterar suas configurações."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Autentique-se com seu nome de usuário e senha."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2679,7 +2679,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/register.php:440
msgid "Confirm"
msgstr "Confirmar"
@@ -2691,11 +2691,11 @@ msgstr "Igual à senha acima"
msgid "Change"
msgstr "Alterar"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "A senha deve ter, no mínimo, 6 caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "As senhas não coincidem."
@@ -2921,43 +2921,43 @@ msgstr "Informações do perfil"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Nome completo"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL do seu site, blog ou perfil em outro site"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Descreva a si mesmo e os seus interesses em %d caracteres"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Descreva a si mesmo e os seus interesses"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Descrição"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Localização"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
@@ -3000,7 +3000,7 @@ msgid ""
msgstr ""
"Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "A descrição é muito extensa (máximo %d caracteres)."
@@ -3264,7 +3264,7 @@ msgstr "A senha deve ter 6 ou mais caracteres."
msgid "Password and confirmation do not match."
msgstr "A senha e a confirmação não coincidem."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
@@ -3274,39 +3274,39 @@ msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
"autenticado."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Desculpe, mas somente convidados podem se registrar."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Desculpe, mas o código do convite é inválido."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Não é permitido o registro."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Você não pode se registrar se não aceitar a licença."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "O endereço de e-mail já existe."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Nome de usuário e/ou senha inválido(s)"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3314,56 +3314,58 @@ msgstr ""
"Através deste formulário você pode criar uma nova conta. A partir daí você "
"pode publicar mensagens e se conectar a amigos e colegas. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "No mínimo 6 caracteres. Obrigatório."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, de preferência seu nome \"real\""
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
+msgstr ""
+"Eu entendo que o conteúdo e os dados de %1$s são particulares e "
+"confidenciais."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Meus textos e arquivos estão licenciados sob a %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Meus textos e arquivos permanecem sob meus próprios direitos autorais."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3373,7 +3375,7 @@ msgstr ""
"particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
"e número de telefone."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3406,7 +3408,7 @@ msgstr ""
"\n"
"Obrigado por se registrar e esperamos que você aproveite o serviço."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5595,14 +5597,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Site: %s"
@@ -6139,8 +6141,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6166,19 +6175,19 @@ msgstr ""
"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Descrição: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Novo endereço de e-mail para publicar no %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6200,30 +6209,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "Mensagem de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Confirmação de SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Aguardando a confirmação deste número de telefone."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Você teve a atenção chamada por %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6251,13 +6260,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nova mensagem particular de %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6291,13 +6300,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) marcou sua mensagem como favorita"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6335,7 +6344,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6343,13 +6352,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) enviou uma mensagem citando você"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6677,7 +6686,7 @@ msgstr "Média diária"
msgid "All groups"
msgstr "Todos os grupos"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Método não implementado."
@@ -6701,7 +6710,7 @@ msgstr "Em destaque"
msgid "Popular"
msgstr "Popular"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Sem argumentos return-to."
@@ -6722,7 +6731,7 @@ msgstr "Repetir esta mensagem"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoga o papel \"%s\" deste usuário"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Nenhum usuário definido para o modo de usuário único."
@@ -6900,56 +6909,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 249d59d65..02fcda7d9 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:01+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:21+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -28,7 +28,7 @@ msgstr ""
#. TRANS: Menu item for site administration
#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
msgid "Access"
-msgstr "Принять"
+msgstr "Доступ"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
@@ -402,33 +402,33 @@ msgstr "Не удаётся найти целевого пользователя
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Неверное имя."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "URL Главной страницы неверен."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Полное имя слишком длинное (не больше 255 знаков)."
@@ -440,7 +440,7 @@ msgstr "Слишком длинное описание (максимум %d си
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
@@ -531,12 +531,12 @@ msgstr "Неправильный токен"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -606,8 +606,8 @@ msgstr ""
msgid "Account"
msgstr "Настройки"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -615,8 +615,8 @@ msgid "Nickname"
msgstr "Имя"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -823,11 +823,11 @@ msgstr "Аватара удалена."
msgid "You already blocked that user."
msgstr "Вы уже заблокировали этого пользователя."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -842,7 +842,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -851,7 +851,7 @@ msgstr "Нет"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не блокировать этого пользователя"
@@ -860,7 +860,7 @@ msgstr "Не блокировать этого пользователя"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -868,11 +868,11 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Заблокировать пользователя."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
@@ -1033,7 +1033,7 @@ msgstr "Удалить это приложение"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Не авторизован."
@@ -1492,7 +1492,7 @@ msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неверный электронный адрес."
@@ -1720,13 +1720,13 @@ msgstr "Пользователь уже имеет эту роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Профиль не определен."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Нет профиля с таким ID."
@@ -2295,39 +2295,39 @@ msgstr "Вы не являетесь членом этой группы."
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вы уже авторизовались."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Некорректное имя или пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Авторизоваться"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Запомнить меня"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Потеряли или забыли пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2335,11 +2335,11 @@ msgstr ""
"По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
"изменять Ваши установки."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Войти с вашим именем участника и паролем."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2673,7 +2673,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Подтверждение"
@@ -2685,11 +2685,11 @@ msgstr "Тот же пароль, что и выше"
msgid "Change"
msgstr "Изменить"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Пароли не совпадают."
@@ -2764,7 +2764,7 @@ msgstr "Путь к сайту"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr "Пусть к локализациям"
+msgstr "Путь к локализациям"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
@@ -2913,43 +2913,43 @@ msgstr "Информация профиля"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Полное имя"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Главная"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишите себя и свои увлечения при помощи %d символов"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишите себя и свои интересы"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Биография"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Месторасположение"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитесь, например «Город, область, страна»"
@@ -2991,7 +2991,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Автоматически подписываться на всех, кто подписался на меня"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Слишком длинная биография (максимум %d символов)."
@@ -3251,7 +3251,7 @@ msgstr "Пароль должен быть длиной не менее 6 сим
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
@@ -3259,41 +3259,41 @@ msgstr "Ошибка в установках пользователя."
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Простите, регистрация только по приглашению."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Извините, неверный пригласительный код."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Регистрация недопустима."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
"соглашения."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Такой электронный адрес уже задействован."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Неверное имя или пароль."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3302,56 +3302,58 @@ msgstr ""
"получите возможность публиковать короткие сообщения и устанавливать связи с "
"друзьями и коллегами. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 или более символов. Обязательное поле."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательное поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имя, предпочтительно Ваше настоящее имя"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
+msgstr ""
+"Я понимаю, что содержание и данные %1$s являются частными и "
+"конфиденциальными."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Авторские права на мои тексты и файлы остаются за мной."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Все права защищены."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3360,7 +3362,7 @@ msgstr ""
"Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
"информации: пароля, почтового адреса, номера мессенджера и номера телефона."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3394,7 +3396,7 @@ msgstr ""
"Спасибо за то, что присоединились к нам, надеемся, что вы получите "
"удовольствие от использования данного сервиса!"
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4522,7 +4524,7 @@ msgstr "Пользователь"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr "Пользовательские настройки для этого сайта StatusNet."
+msgstr "Настройки пользователя для этого сайта StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
@@ -5111,7 +5113,7 @@ msgstr "Поиск"
#. TRANS: Menu item for site administration
#: lib/action.php:515 lib/adminpanelaction.php:399
msgid "Site notice"
-msgstr "Новая запись"
+msgstr "Уведомление сайта"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:582
@@ -5583,14 +5585,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Домашняя страница: %s"
@@ -6128,8 +6130,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s теперь следит за вашими записями на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6155,19 +6164,19 @@ msgstr ""
"Измените email-адрес и настройки уведомлений на %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Биография: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Новый электронный адрес для постинга %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6189,30 +6198,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s статус"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Подтверждение СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s. Подтвердите, что это ваш телефон, следующим кодом:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Вас «подтолкнул» пользователь %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6240,13 +6249,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Новое приватное сообщение от %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6280,13 +6289,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) добавил вашу запись в число своих любимых"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6324,7 +6333,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6335,13 +6344,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) отправил запись для вашего внимания"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6688,7 +6697,7 @@ msgstr "Среднесуточная"
msgid "All groups"
msgstr "Все группы"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Нереализованный метод."
@@ -6712,7 +6721,7 @@ msgstr "Особые"
msgid "Popular"
msgstr "Популярное"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Нет аргумента return-to."
@@ -6733,7 +6742,7 @@ msgstr "Повторить эту запись"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ни задан пользователь для однопользовательского режима."
@@ -6911,56 +6920,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "пару секунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "около часа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "около дня назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "около месяца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index da42f33dd..5763c7b95 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-05-16 15:39+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+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"
@@ -377,32 +377,32 @@ msgstr ""
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr ""
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr ""
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr ""
@@ -505,12 +505,12 @@ msgstr ""
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -575,8 +575,8 @@ msgstr ""
msgid "Account"
msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -584,8 +584,8 @@ msgid "Nickname"
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -791,11 +791,11 @@ msgstr ""
msgid "You already blocked that user."
msgstr ""
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr ""
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -807,7 +807,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -816,7 +816,7 @@ msgstr ""
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr ""
@@ -825,7 +825,7 @@ msgstr ""
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -833,11 +833,11 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr ""
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -995,7 +995,7 @@ msgstr ""
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1436,7 +1436,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -1655,13 +1655,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2167,49 +2167,49 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr ""
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr ""
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr ""
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr ""
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr ""
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr ""
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2530,7 +2530,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr ""
@@ -2542,11 +2542,11 @@ msgstr ""
msgid "Change"
msgstr ""
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2766,43 +2766,43 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr ""
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr ""
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr ""
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr ""
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2842,7 +2842,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr ""
@@ -3086,7 +3086,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3094,100 +3094,100 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr ""
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr ""
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr ""
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3206,7 +3206,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5274,14 +5274,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5757,8 +5757,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5774,19 +5781,19 @@ msgid ""
msgstr ""
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr ""
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5800,30 +5807,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5840,13 +5847,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5866,13 +5873,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr ""
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5894,7 +5901,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5902,13 +5909,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6225,7 +6232,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6249,7 +6256,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr ""
@@ -6270,7 +6277,7 @@ msgstr ""
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6448,56 +6455,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 0cd352cbc..bd24ccc00 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:05+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:25+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -390,33 +390,33 @@ msgstr "Kunde inte hitta målanvändare."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Smeknamnet används redan. Försök med ett annat."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Hemsida är inte en giltig webbadress."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
@@ -428,7 +428,7 @@ msgstr "Beskrivning är för lång (max 140 tecken)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -519,12 +519,12 @@ msgstr "Ogiltig token."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -592,8 +592,8 @@ msgstr ""
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -601,8 +601,8 @@ msgid "Nickname"
msgstr "Smeknamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Lösenord"
@@ -809,11 +809,11 @@ msgstr "Avatar borttagen."
msgid "You already blocked that user."
msgstr "Du har redan blockerat denna användare."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Blockera användare"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -828,7 +828,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -837,7 +837,7 @@ msgstr "Nej"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Blockera inte denna användare"
@@ -846,7 +846,7 @@ msgstr "Blockera inte denna användare"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -854,11 +854,11 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Blockera denna användare"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
@@ -1020,7 +1020,7 @@ msgstr "Ta bort denna applikation"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Inte inloggad."
@@ -1470,7 +1470,7 @@ msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
@@ -1698,13 +1698,13 @@ msgstr "Användaren har redan denna roll."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil angiven."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med det ID:t."
@@ -2271,39 +2271,39 @@ msgstr "Du är inte en medlem i den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Redan inloggad."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Felaktigt användarnamn eller lösenord."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Tappat bort eller glömt ditt lösenord?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2311,11 +2311,11 @@ msgstr ""
"Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
"igen innan du ändrar dina inställningar."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Logga in med ditt användarnamn och lösenord."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2649,7 +2649,7 @@ msgid "6 or more characters"
msgstr "Minst 6 tecken"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Bekräfta"
@@ -2661,11 +2661,11 @@ msgstr "Samma som lösenordet ovan"
msgid "Change"
msgstr "Ändra"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Lösenorden matchar inte."
@@ -2890,43 +2890,43 @@ msgstr "Profilinformation"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Fullständigt namn"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Beskriv dig själv och dina intressen med högst 140 tecken"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Beskriv dig själv och dina intressen"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Biografi"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Plats"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
@@ -2970,7 +2970,7 @@ msgstr ""
"Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
"människa) "
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Biografin är för lång (max %d tecken)."
@@ -3232,7 +3232,7 @@ msgstr "Lösenordet måste vara minst 6 tecken."
msgid "Password and confirmation do not match."
msgstr "Lösenord och bekräftelse matchar inte."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
@@ -3240,39 +3240,39 @@ msgstr "Fel uppstog i användarens inställning"
msgid "New password successfully saved. You are now logged in."
msgstr "Nya lösenordet sparat. Du är nu inloggad."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Tyvärr, ogiltig inbjudningskod."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Registrering inte tillåten."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Du kan inte registrera dig om du inte godkänner licensen."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "E-postadressen finns redan."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Ogiltigt användarnamn eller lösenord."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3280,59 +3280,60 @@ msgstr ""
"Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser "
"och ansluta till vänner och kollegor. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
"i."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Minst 6 tecken. Måste fyllas i."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Samma som lösenordet ovan. Måste fyllas i."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "E-post"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Används endast för uppdateringar, tillkännagivanden och återskapande av "
"lösenord"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Innehåll och data av %1$s är privat och konfidensiell."
+msgstr ""
+"Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Upphovsrätten till min text och mina filer innehas av %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Upphovsrätten till min text och mina filer är fortsatt min."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Alla rättigheter reserverade."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3341,7 +3342,7 @@ msgstr ""
"Mina texter och filer är tillgängliga under %s med undantag av den här "
"privata datan: lösenord, e-postadress, IM-adress, telefonnummer."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3374,7 +3375,7 @@ msgstr ""
"Tack för att du anmält dig och vi hoppas att du kommer tycka om att använda "
"denna tjänst."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5556,14 +5557,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Hemsida: %s"
@@ -6094,8 +6095,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s lyssnar nu på dina notiser på %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6121,19 +6129,19 @@ msgstr ""
"Ändra din e-postadress eller notiferingsinställningar på %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Biografi: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Ny e-postadress för att skicka till %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6155,30 +6163,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s status"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS-bekräftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s: bekräfta detta telefonnummer med denna kod:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Du har blivit knuffad av %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6206,13 +6214,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Nytt privat meddelande från %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6246,13 +6254,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) lade till din notis som en favorit"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6290,7 +6298,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6301,13 +6309,13 @@ msgstr ""
"\n"
"\t%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) skickade en notis för din uppmärksamhet"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6655,7 +6663,7 @@ msgstr "Dagligt genomsnitt"
msgid "All groups"
msgstr "Alla grupper"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Inte implementerad metod."
@@ -6679,7 +6687,7 @@ msgstr "Profilerade"
msgid "Popular"
msgstr "Populärt"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Inga \"return-to\"-argument."
@@ -6700,7 +6708,7 @@ msgstr "Upprepa denna notis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
@@ -6878,56 +6886,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 c205085d3..ac611ff53 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:08+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:28+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -386,32 +386,32 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "సరైన పేరు కాదు."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
@@ -423,7 +423,7 @@ msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అ
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -515,12 +515,12 @@ msgstr "తప్పుడు పరిమాణం."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -587,8 +587,8 @@ msgstr ""
msgid "Account"
msgstr "ఖాతా"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -596,8 +596,8 @@ msgid "Nickname"
msgstr "పేరు"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "సంకేతపదం"
@@ -674,7 +674,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు"
#: actions/apitimelinementions.php:117
#, php-format
msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgstr "%1$s / %2$sని పేర్కొన్న నోటీసులు"
#: actions/apitimelinementions.php:130
#, php-format
@@ -707,9 +707,9 @@ msgid "Notices tagged with %s"
msgstr ""
#: actions/apitimelinetag.php:106 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%s యొక్క మైక్రోబ్లాగు"
+msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
#: actions/attachment.php:73
msgid "No such attachment."
@@ -805,11 +805,11 @@ msgstr "అవతారాన్ని తొలగించాం."
msgid "You already blocked that user."
msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "వాడుకరిని నిరోధించు"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -823,7 +823,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -832,7 +832,7 @@ msgstr "కాదు"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "ఈ వాడుకరిని నిరోధించకు"
@@ -841,7 +841,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -849,11 +849,11 @@ msgid "Yes"
msgstr "అవును"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
@@ -901,9 +901,9 @@ msgstr "అటువంటి వాడుకరి లేరు."
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "%s పై గుంపులు"
+msgstr "%sకి టపాచెయ్యి"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -1015,7 +1015,7 @@ msgstr "ఈ ఉపకరణాన్ని తొలగించు"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "లోనికి ప్రవేశించలేదు."
@@ -1270,9 +1270,8 @@ msgid "Callback URL is not valid."
msgstr ""
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "గుంపుని తాజాకరించలేకున్నాం."
+msgstr "ఉపకరణాన్ని తాజాకరించలేకున్నాం."
#: actions/editgroup.php:56
#, php-format
@@ -1462,7 +1461,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
@@ -1683,13 +1682,13 @@ msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2235,50 +2234,50 @@ msgstr "మీరు ఆ గుంపులో సభ్యులు కాద
msgid "%1$s left group %2$s"
msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "సైటు లోనికి ప్రవేశించు"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "నన్ను గుర్తుంచుకో"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "మీ సంకేతపదం మర్చిపోయారా?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
"భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2480,9 +2479,8 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "నోటీసుకి ప్రొఫైలు లేదు."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2611,7 +2609,7 @@ msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "నిర్థారించు"
@@ -2623,11 +2621,11 @@ msgstr "పై సంకేతపదం వలెనే"
msgid "Change"
msgstr "మార్చు"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "సంకేతపదాలు సరిపోలలేదు."
@@ -2858,43 +2856,43 @@ msgstr "ప్రొఫైలు సమాచారం"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "పూర్తి పేరు"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమ్ పేజీ"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "స్వపరిచయం"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "ప్రాంతం"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
@@ -2934,7 +2932,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
@@ -3183,7 +3181,7 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr ""
@@ -3191,93 +3189,93 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "నమోదు అనుమతించబడదు."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "ఈమెయిల్"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3286,7 +3284,7 @@ msgstr ""
"నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
"చిరునామా, మరియు ఫోన్ నంబర్."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3317,7 +3315,7 @@ msgstr ""
"\n"
"నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3469,9 +3467,8 @@ msgid "You cannot revoke user roles on this site."
msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరికి ఈ పాత్ర లేదు."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -4654,7 +4651,7 @@ msgstr ""
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "ప్లగిన్లు"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
#: actions/version.php:196 lib/action.php:779
@@ -5460,14 +5457,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "హోంపేజీ: %s"
@@ -5958,8 +5955,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5985,19 +5989,19 @@ msgstr ""
"మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "స్వపరిచయం: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6011,30 +6015,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s స్థితి"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS నిర్ధారణ"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6062,13 +6066,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6102,13 +6106,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6146,7 +6150,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6157,13 +6161,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) మీకు ఒక నోటీసుని పంపించారు"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6511,7 +6515,7 @@ msgstr "రోజువారీ సగటు"
msgid "All groups"
msgstr "అన్ని గుంపులు"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6535,7 +6539,7 @@ msgstr "విశేషం"
msgid "Popular"
msgstr "ప్రాచుర్యం"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "అటువంటి పత్రమేమీ లేదు."
@@ -6557,7 +6561,7 @@ msgstr "ఈ నోటీసుని పునరావృతించు"
msgid "Revoke the \"%s\" role from this user"
msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6740,56 +6744,56 @@ msgid "Moderator"
msgstr "సమన్వయకర్త"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 54d1a00d7..6247728ed 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:12+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:32+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -400,7 +400,7 @@ msgstr "Kullanıcı güncellenemedi."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
@@ -408,26 +408,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tam isim çok uzun (azm: 255 karakter)."
@@ -439,7 +439,7 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
@@ -534,12 +534,12 @@ msgstr "Geçersiz büyüklük."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -608,8 +608,8 @@ msgstr ""
msgid "Account"
msgstr "Hakkında"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -617,8 +617,8 @@ msgid "Nickname"
msgstr "Takma ad"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Parola"
@@ -836,12 +836,12 @@ msgstr "Avatar güncellendi."
msgid "You already blocked that user."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -853,7 +853,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -863,7 +863,7 @@ msgstr "Durum mesajları"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Böyle bir kullanıcı yok."
@@ -873,7 +873,7 @@ msgstr "Böyle bir kullanıcı yok."
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -881,12 +881,12 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Böyle bir kullanıcı yok."
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1055,7 +1055,7 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Giriş yapılmadı."
@@ -1528,7 +1528,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
@@ -1763,13 +1763,13 @@ msgstr "Kullanıcının profili yok."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2312,41 +2312,41 @@ msgstr "Bize o profili yollamadınız"
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Yanlış kullanıcı adı veya parola."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Parolamı unuttum veya kaybettim"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2354,12 +2354,12 @@ msgstr ""
"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
"ve parolanızı tekrar giriniz."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Geçersiz kullanıcı adı veya parola."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2700,7 +2700,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/register.php:440
msgid "Confirm"
msgstr "Onayla"
@@ -2712,11 +2712,11 @@ msgstr "yukarıdaki parolanın aynısı"
msgid "Change"
msgstr "Değiştir"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Parolalar birbirini tutmuyor."
@@ -2954,45 +2954,45 @@ msgstr ""
"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
"verilmez"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tam İsim"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Hakkında"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Yer"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
@@ -3032,7 +3032,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
@@ -3284,7 +3284,7 @@ msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
msgid "Password and confirmation do not match."
msgstr "Parola ve onaylaması birbirini tutmuyor."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
@@ -3292,95 +3292,95 @@ msgstr "Kullanıcı ayarlamada hata oluştu."
msgid "New password successfully saved. You are now logged in."
msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Onay kodu hatası."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Eposta adresi zaten var."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Geçersiz kullanıcı adı veya parola."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Eposta"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3389,7 +3389,7 @@ msgstr ""
"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
"numarası."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3408,7 +3408,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5606,14 +5606,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -6112,8 +6112,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6135,19 +6142,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Hakkında"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6161,30 +6168,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s durum"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6201,13 +6208,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6227,13 +6234,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6255,7 +6262,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6263,13 +6270,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6598,7 +6605,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6623,7 +6630,7 @@ msgstr ""
msgid "Popular"
msgstr "Kişi Arama"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Böyle bir belge yok."
@@ -6647,7 +6654,7 @@ msgstr "Böyle bir durum mesajı yok."
msgid "Revoke the \"%s\" role from this user"
msgstr "Böyle bir kullanıcı yok."
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6835,56 +6842,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 ce85953d6..d980cbc7d 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:15+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:35+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -395,7 +395,7 @@ msgstr "Не вдалося знайти цільового користувач
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
@@ -403,26 +403,26 @@ msgstr ""
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Це ім’я вже використовується. Спробуйте інше."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Це недійсне ім’я користувача."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Веб-сторінка має недійсну URL-адресу."
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Повне ім’я задовге (255 знаків максимум)"
@@ -434,7 +434,7 @@ msgstr "Опис надто довгий (%d знаків максимум)."
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Розташування надто довге (255 знаків максимум)."
@@ -525,12 +525,12 @@ msgstr "Невірний токен."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -602,8 +602,8 @@ msgstr ""
msgid "Account"
msgstr "Акаунт"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -611,8 +611,8 @@ msgid "Nickname"
msgstr "Ім’я користувача"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Пароль"
@@ -820,11 +820,11 @@ msgstr "Аватару видалено."
msgid "You already blocked that user."
msgstr "Цього користувача вже заблоковано."
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Блокувати користувача"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -839,7 +839,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -848,7 +848,7 @@ msgstr "Ні"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Не блокувати цього користувача"
@@ -857,7 +857,7 @@ msgstr "Не блокувати цього користувача"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -865,11 +865,11 @@ msgid "Yes"
msgstr "Так"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
msgid "Block this user"
msgstr "Блокувати користувача"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
@@ -1030,7 +1030,7 @@ msgstr "Видалити додаток"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Не увійшли."
@@ -1477,7 +1477,7 @@ msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійсна електронна адреса."
@@ -1703,13 +1703,13 @@ msgstr "Користувач вже має цю роль."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Не визначено жодного профілю."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Не визначено профілю з таким ID."
@@ -2279,41 +2279,41 @@ msgstr "Ви не є учасником цієї групи."
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Тепер Ви увійшли."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Неточне ім’я або пароль."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "Вхід на сайт"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Пам’ятати мене"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Автоматично входити у майбутньому; не для комп’ютерів загального "
"користування!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Загубили або забули пароль?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2321,11 +2321,11 @@ msgstr ""
"З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
"змінювати налаштування."
-#: actions/login.php:270
+#: actions/login.php:292
msgid "Login with your username and password."
msgstr "Увійти використовуючи ім’я та пароль."
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2661,7 +2661,7 @@ msgid "6 or more characters"
msgstr "6 або більше знаків"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "Підтвердити"
@@ -2673,11 +2673,11 @@ msgstr "Такий само, як і пароль вище"
msgid "Change"
msgstr "Змінити"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "Пароль має складатись з 6-ти або більше знаків."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Паролі не співпадають."
@@ -2902,43 +2902,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Повне ім’я"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-сторінка"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL-адреса Вашої веб-сторінки, блоґу, або профілю на іншому сайті"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Опишіть себе та свої інтереси (%d знаків)"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
msgid "Describe yourself and your interests"
msgstr "Опишіть себе та свої інтереси"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Про себе"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Розташування"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де Ви живете, на кшталт «Місто, область (регіон), країна»"
@@ -2981,7 +2981,7 @@ msgid ""
msgstr ""
"Автоматично підписуватись до тих, хто підписався до мене. (Слава роботам!)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Ви перевищили ліміт (%d знаків максимум)."
@@ -3243,7 +3243,7 @@ msgstr "Пароль має складатись з 6-ти або більше
msgid "Password and confirmation do not match."
msgstr "Пароль та підтвердження не співпадають."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Помилка в налаштуваннях користувача."
@@ -3251,40 +3251,40 @@ msgstr "Помилка в налаштуваннях користувача."
msgid "New password successfully saved. You are now logged in."
msgstr "Новий пароль успішно збережено. Тепер Ви увійшли."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
-#: actions/register.php:92
+#: actions/register.php:99
msgid "Sorry, invalid invitation code."
msgstr "Даруйте, помилка у коді запрошення."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "Реєстрацію не дозволено."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Ця адреса вже використовується."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Недійсне ім’я або пароль."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3292,57 +3292,57 @@ msgstr ""
"Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
"будете в курсі справ ваших друзів та колег. "
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
"Неодмінно."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 або більше знаків. Неодмінно."
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Пошта"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)"
-#: actions/register.php:511
-#, fuzzy, php-format
+#: actions/register.php:518
+#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
-msgstr "Зміст і дані %1$s є приватними і конфіденційними."
+msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Авторські права на мої тексти і файли належать %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Авторські права на мої тексти і файли залишаються за мною."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
-msgstr ""
+msgstr "Всі права захищені."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -3351,7 +3351,7 @@ msgstr ""
"Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, "
"електронна адреса, адреса IM, телефонний номер."
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3384,7 +3384,7 @@ msgstr ""
"Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш "
"сервіс."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5566,14 +5566,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "Веб-сторінка: %s"
@@ -6107,8 +6107,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s тепер слідкує за Вашими дописами на %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6134,19 +6141,19 @@ msgstr ""
"Змінити електронну адресу або умови сповіщення — %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, php-format
msgid "Bio: %s"
msgstr "Про себе: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Нова електронна адреса для надсилання повідомлень на %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6168,18 +6175,18 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s статус"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Підтвердження СМС"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
@@ -6187,13 +6194,13 @@ msgstr ""
"скориставшись даним кодом:"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "Вас спробував «розштовхати» %s"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6221,13 +6228,13 @@ msgstr ""
"%4$s\n"
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Нове приватне повідомлення від %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6261,13 +6268,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s (@%s) додав(ла) Ваш допис обраних"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6305,7 +6312,7 @@ msgstr ""
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6316,13 +6323,13 @@ msgstr ""
"\n"
"%s"
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr "%s (@%s) пропонує до Вашої уваги наступний допис"
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6670,7 +6677,7 @@ msgstr "Середньодобове"
msgid "All groups"
msgstr "Всі групи"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "Метод не виконується."
@@ -6694,7 +6701,7 @@ msgstr "Постаті"
msgid "Popular"
msgstr "Популярне"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
msgid "No return-to arguments."
msgstr "Немає аргументів return-to."
@@ -6715,7 +6722,7 @@ msgstr "Повторити цей допис"
msgid "Revoke the \"%s\" role from this user"
msgstr "Відкликати роль \"%s\" для цього користувача"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr "Користувача для однокористувацького режиму не визначено."
@@ -6893,56 +6900,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "місяць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index de5d64dc1..074f4b78f 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:18+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:38+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -404,32 +404,32 @@ msgstr "Không tìm thấy bất kỳ trạng thái nào."
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "Biệt hiệu không hợp lệ."
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "Trang chủ không phải là URL"
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
@@ -441,7 +441,7 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
@@ -536,12 +536,12 @@ msgstr "Kích thước không hợp lệ."
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -610,8 +610,8 @@ msgstr ""
msgid "Account"
msgstr "Giới thiệu"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -619,8 +619,8 @@ msgid "Nickname"
msgstr "Biệt danh"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "Mật khẩu"
@@ -840,12 +840,12 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "You already blocked that user."
msgstr "Bạn đã theo những người này:"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "Ban user"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -857,7 +857,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -867,7 +867,7 @@ msgstr "Không"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "Bỏ chặn người dùng này"
@@ -877,7 +877,7 @@ msgstr "Bỏ chặn người dùng này"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -886,12 +886,12 @@ msgid "Yes"
msgstr "Có"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "Ban user"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1060,7 +1060,7 @@ msgstr "Xóa tin nhắn"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Chưa đăng nhập."
@@ -1555,7 +1555,7 @@ msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa địa chỉ GTalk này"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Địa chỉ email không hợp lệ."
@@ -1803,13 +1803,13 @@ msgstr "Người dùng không có thông tin."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
@@ -2394,40 +2394,40 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Đã đăng nhập."
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -2435,12 +2435,12 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong điều chỉnh."
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2793,7 +2793,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/register.php:440
msgid "Confirm"
msgstr "Xác nhận"
@@ -2805,12 +2805,12 @@ msgstr "Cùng mật khẩu ở trên"
msgid "Change"
msgstr "Thay đổi"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
#, fuzzy
msgid "Password must be 6 or more characters."
msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "Mật khẩu không khớp."
@@ -3052,44 +3052,44 @@ msgstr "Hồ sơ này không biết"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "Tên đầy đủ"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "Lý lịch"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "Thành phố"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
@@ -3129,7 +3129,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "Tự động theo những người nào đăng ký theo tôi"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "Lý lịch quá dài (không quá 140 ký tự)"
@@ -3385,7 +3385,7 @@ msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
msgid "Password and confirmation do not match."
msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
@@ -3393,104 +3393,104 @@ msgstr "Lỗi xảy ra khi tạo thành viên."
msgid "New password successfully saved. You are now logged in."
msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "Lỗi xảy ra với mã xác nhận."
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
-#: actions/register.php:135
+#: actions/register.php:142
#, fuzzy
msgid "Registration not allowed."
msgstr "Biệt hiệu không được cho phép."
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "Địa chỉ email đã tồn tại."
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt "
"buộc."
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "Email"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3521,7 +3521,7 @@ msgstr ""
"\n"
"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5769,14 +5769,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
@@ -6300,8 +6300,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6323,19 +6330,19 @@ msgstr ""
"%4$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "Thành phố: %s"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "Dia chi email moi de gui tin nhan den %s"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6357,30 +6364,30 @@ msgstr ""
"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, fuzzy, php-format
msgid "%s status"
msgstr "Trạng thái của %1$s vào %2$s"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "Xác nhận SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "Đó không phải là số điện thoại của bạn."
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6397,13 +6404,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6437,13 +6444,13 @@ msgstr ""
"%5$s\n"
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, fuzzy, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6478,7 +6485,7 @@ msgstr ""
"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6486,13 +6493,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6830,7 +6837,7 @@ msgstr ""
msgid "All groups"
msgstr "Nhóm"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6857,7 +6864,7 @@ msgstr ""
msgid "Popular"
msgstr "Tên tài khoản"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "Không có tài liệu nào."
@@ -6881,7 +6888,7 @@ msgstr "Trả lời tin nhắn này"
msgid "Revoke the \"%s\" role from this user"
msgstr "Ban user"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -7078,56 +7085,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "1 giờ trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 771e303de..c19106ce1 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:21+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:42+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -402,32 +402,32 @@ msgstr "找不到任何信息。"
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字,不包含空格。"
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "全名过长(不能超过 255 个字符)。"
@@ -439,7 +439,7 @@ msgstr "描述过长(不能超过140字符)。"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "位置过长(不能超过255个字符)。"
@@ -534,12 +534,12 @@ msgstr "大小不正确。"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -607,8 +607,8 @@ msgstr ""
msgid "Account"
msgstr "帐号"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -616,8 +616,8 @@ msgid "Nickname"
msgstr "昵称"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "密码"
@@ -835,12 +835,12 @@ msgstr "头像已更新。"
msgid "You already blocked that user."
msgstr "您已成功阻止该用户:"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "阻止用户"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -852,7 +852,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
#, fuzzy
@@ -862,7 +862,7 @@ msgstr "否"
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "取消阻止次用户"
@@ -872,7 +872,7 @@ msgstr "取消阻止次用户"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
#, fuzzy
@@ -881,12 +881,12 @@ msgid "Yes"
msgstr "是"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr "保存阻止信息失败。"
@@ -1058,7 +1058,7 @@ msgstr "删除通告"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
@@ -1540,7 +1540,7 @@ msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
@@ -1781,14 +1781,14 @@ msgstr "用户没有个人信息。"
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
#, fuzzy
msgid "No profile specified."
msgstr "没有收件人。"
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
#, fuzzy
msgid "No profile with that ID."
msgstr "没有找到此ID的信息。"
@@ -2354,51 +2354,51 @@ msgstr "您未告知此个人信息"
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登录。"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "忘记了密码?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "输入用户名和密码以登录。"
-#: actions/login.php:273
+#: actions/login.php:295
#, fuzzy, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2743,7 +2743,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "确认"
@@ -2755,11 +2755,11 @@ msgstr "相同的密码"
msgid "Change"
msgstr "修改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr "密码必须包含 6 个或更多字符。"
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr "密码不匹配。"
@@ -2995,44 +2995,44 @@ msgstr "未知的帐号"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "全名"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr "您的主页、博客或在其他站点的URL"
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "用不超过140个字符描述您自己和您的爱好"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "用不超过140个字符描述您自己和您的爱好"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自述"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "位置"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的位置,格式类似\"城市,省份,国家\""
@@ -3072,7 +3072,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(不能超过140字符)。"
@@ -3325,7 +3325,7 @@ msgstr "密码必须是 6 个字符或更多。"
msgid "Password and confirmation do not match."
msgstr "密码和确认不匹配。"
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "保存用户设置时出错。"
@@ -3333,101 +3333,101 @@ msgstr "保存用户设置时出错。"
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,您现在已登录。"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr "对不起,请邀请那些能注册的人。"
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "验证码出错。"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr "不允许注册。"
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr "您必须同意此授权方可注册。"
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "电子邮件地址已存在。"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 到 64 个小写字母或数字,不包含标点及空白。此项必填。"
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr "6 个或更多字符。此项必填。"
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "电子邮件"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr "只用于更新、通告或密码恢复"
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr "长名字,最好是“实名”"
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
-#: actions/register.php:576
+#: actions/register.php:583
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3458,7 +3458,7 @@ msgstr ""
"\n"
"感谢您的注册,希望您喜欢这个服务。"
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5696,14 +5696,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
@@ -6204,8 +6204,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s 信息。"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6226,7 +6233,7 @@ msgstr ""
"为您效力的 %4$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
@@ -6234,13 +6241,13 @@ msgstr ""
"\n"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电子邮件地址,用于发布 %s 信息"
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6261,30 +6268,30 @@ msgstr ""
"为您效力的 %4$s"
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr "%s 状态"
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS短信确认"
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, fuzzy, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "等待确认此电话号码。"
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 振铃呼叫你"
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6301,13 +6308,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr "%s 发送了新的私人信息"
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6327,13 +6334,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s 收藏了您的通告"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6355,7 +6362,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6363,13 +6370,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6705,7 +6712,7 @@ msgstr ""
msgid "All groups"
msgstr "所有组"
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6731,7 +6738,7 @@ msgstr "特征"
msgid "Popular"
msgstr "用户"
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "没有这份文档。"
@@ -6755,7 +6762,7 @@ msgstr "无法删除通告。"
msgid "Revoke the \"%s\" role from this user"
msgstr "该组成员列表。"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6952,56 +6959,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr "一分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr "一小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr "一天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr "一个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
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 43e6effc8..fff611bd7 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-05-16 15:39+0000\n"
-"PO-Revision-Date: 2010-05-16 15:41:24+0000\n"
+"POT-Creation-Date: 2010-05-25 11:36+0000\n"
+"PO-Revision-Date: 2010-05-25 11:38:46+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 (r66533); Translate extension (2010-05-15)\n"
+"X-Generator: MediaWiki 1.17alpha (r66863); Translate extension (2010-05-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -394,32 +394,32 @@ msgstr "無法更新使用者"
#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:205
+#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "暱稱請用小寫字母或數字,勿加空格。"
#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:208
+#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "此暱稱已有人使用。再試試看別的吧。"
#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:210
+#: actions/register.php:217
msgid "Not a valid nickname."
msgstr ""
#: actions/apigroupcreate.php:198 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:217
+#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "個人首頁位址錯誤"
#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:220
+#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "全名過長(最多255字元)"
@@ -431,7 +431,7 @@ msgstr "自我介紹過長(共140個字元)"
#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:227
+#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "地點過長(共255個字)"
@@ -525,12 +525,12 @@ msgstr "尺寸錯誤"
#: 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:227
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:137 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/register.php:172 actions/remotesubscribe.php:77
#: 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
@@ -599,8 +599,8 @@ msgstr ""
msgid "Account"
msgstr "關於"
-#: actions/apioauthauthorize.php:313 actions/login.php:230
-#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:132
@@ -608,8 +608,8 @@ msgid "Nickname"
msgstr "暱稱"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
msgid "Password"
msgstr ""
@@ -823,12 +823,12 @@ msgstr "更新個人圖像"
msgid "You already blocked that user."
msgstr "無此使用者"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "無此使用者"
-#: actions/block.php:130
+#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -840,7 +840,7 @@ msgstr ""
#. 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/block.php:153 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
msgctxt "BUTTON"
@@ -849,7 +849,7 @@ msgstr ""
#. 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
+#: actions/block.php:157 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "無此使用者"
@@ -859,7 +859,7 @@ msgstr "無此使用者"
#. 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/block.php:160 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
msgctxt "BUTTON"
@@ -867,12 +867,12 @@ msgid "Yes"
msgstr ""
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "無此使用者"
-#: actions/block.php:179
+#: actions/block.php:187
msgid "Failed to save block information."
msgstr ""
@@ -1041,7 +1041,7 @@ msgstr "請在140個字以內描述你自己與你的興趣"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr ""
@@ -1509,7 +1509,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:201
+#: actions/emailsettings.php:366 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "此信箱無效"
@@ -1742,13 +1742,13 @@ msgstr ""
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:70
+#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr ""
@@ -2272,50 +2272,50 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登入"
-#: actions/login.php:126
+#: actions/login.php:148
msgid "Incorrect username or password."
msgstr "使用者名稱或密碼錯誤"
-#: actions/login.php:132 actions/otp.php:120
+#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
-#: actions/login.php:227
+#: actions/login.php:249
msgid "Login to site"
msgstr ""
-#: actions/login.php:236 actions/register.php:478
+#: actions/login.php:258 actions/register.php:485
msgid "Remember me"
msgstr ""
-#: actions/login.php:237 actions/register.php:480
+#: actions/login.php:259 actions/register.php:487
msgid "Automatically login in the future; not for shared computers!"
msgstr "未來在同一部電腦自動登入"
-#: actions/login.php:247
+#: actions/login.php:269
msgid "Lost or forgotten password?"
msgstr "遺失或忘記密碼了嗎?"
-#: actions/login.php:266
+#: actions/login.php:288
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr "為安全起見,請先重新輸入你的使用者名稱與密碼再更改設定。"
-#: actions/login.php:270
+#: actions/login.php:292
#, fuzzy
msgid "Login with your username and password."
msgstr "使用者名稱或密碼無效"
-#: actions/login.php:273
+#: actions/login.php:295
#, php-format
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -2648,7 +2648,7 @@ msgid "6 or more characters"
msgstr "6個以上字元"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433
+#: actions/register.php:440
msgid "Confirm"
msgstr "確認"
@@ -2660,11 +2660,11 @@ msgstr ""
msgid "Change"
msgstr "更改"
-#: actions/passwordsettings.php:154 actions/register.php:230
+#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:233
+#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
msgstr ""
@@ -2892,44 +2892,44 @@ msgstr ""
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64個小寫英文字母或數字,勿加標點符號或空格"
-#: actions/profilesettings.php:111 actions/register.php:448
+#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "全名"
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:453
+#: actions/profilesettings.php:115 actions/register.php:460
#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "個人首頁"
-#: actions/profilesettings.php:117 actions/register.php:455
+#: actions/profilesettings.php:117 actions/register.php:462
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:122 actions/register.php:468
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "請在140個字以內描述你自己與你的興趣"
-#: actions/profilesettings.php:125 actions/register.php:464
+#: actions/profilesettings.php:125 actions/register.php:471
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "請在140個字以內描述你自己與你的興趣"
-#: actions/profilesettings.php:127 actions/register.php:466
+#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
msgstr "自我介紹"
-#: actions/profilesettings.php:132 actions/register.php:471
+#: actions/profilesettings.php:132 actions/register.php:478
#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
msgstr "地點"
-#: actions/profilesettings.php:134 actions/register.php:473
+#: actions/profilesettings.php:134 actions/register.php:480
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -2969,7 +2969,7 @@ msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:228 actions/register.php:223
+#: actions/profilesettings.php:228 actions/register.php:230
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自我介紹過長(共140個字元)"
@@ -3216,7 +3216,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:255
msgid "Error setting user."
msgstr "使用者設定發生錯誤"
@@ -3224,101 +3224,101 @@ msgstr "使用者設定發生錯誤"
msgid "New password successfully saved. You are now logged in."
msgstr "新密碼已儲存成功。你已登入。"
-#: actions/register.php:85 actions/register.php:189 actions/register.php:405
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
msgid "Sorry, only invited people can register."
msgstr ""
-#: actions/register.php:92
+#: actions/register.php:99
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "確認碼發生錯誤"
-#: actions/register.php:112
+#: actions/register.php:119
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:499 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
-#: actions/register.php:135
+#: actions/register.php:142
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:198
+#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:212
+#: actions/register.php:219
msgid "Email address already exists."
msgstr "此電子信箱已註冊過了"
-#: actions/register.php:243 actions/register.php:265
+#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
msgstr "使用者名稱或密碼無效"
-#: actions/register.php:343
+#: actions/register.php:350
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:425
+#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:430
+#: actions/register.php:437
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:434
+#: actions/register.php:441
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "電子信箱"
-#: actions/register.php:439 actions/register.php:443
+#: actions/register.php:446 actions/register.php:450
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:450
+#: actions/register.php:457
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:511
+#: actions/register.php:518
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:521
+#: actions/register.php:528
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:525
+#: actions/register.php:532
msgid "My text and files remain under my own copyright."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:528
+#: actions/register.php:535
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:533
+#: actions/register.php:540
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr "不包含這些個人資料:密碼、電子信箱、線上即時通信箱、電話號碼"
-#: actions/register.php:576
+#: actions/register.php:583
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3337,7 +3337,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:600
+#: actions/register.php:607
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5498,14 +5498,14 @@ 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:422 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:268
#, 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:426 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr ""
@@ -5995,8 +5995,15 @@ msgstr ""
msgid "%1$s is now listening to your notices on %2$s."
msgstr "現在%1$s在%2$s成為你的粉絲囉"
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:249
+#: lib/mail.php:254
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -6019,19 +6026,19 @@ msgstr ""
"敬上。\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:269
+#: lib/mail.php:274
#, fuzzy, php-format
msgid "Bio: %s"
msgstr "自我介紹"
#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:298
+#: lib/mail.php:304
#, php-format
msgid "New email address for posting to %s"
msgstr ""
#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:302
+#: lib/mail.php:308
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -6045,30 +6052,30 @@ msgid ""
msgstr ""
#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:427
+#: lib/mail.php:433
#, php-format
msgid "%s status"
msgstr ""
#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:454
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr ""
#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:457
+#: lib/mail.php:463
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:478
+#: lib/mail.php:484
#, php-format
msgid "You've been nudged by %s"
msgstr ""
#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:483
+#: lib/mail.php:489
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -6085,13 +6092,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:530
+#: lib/mail.php:536
#, php-format
msgid "New private message from %s"
msgstr ""
#. TRANS: Body for direct-message notification email
-#: lib/mail.php:535
+#: lib/mail.php:541
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -6111,13 +6118,13 @@ msgid ""
msgstr ""
#. TRANS: Subject for favorite notification email
-#: lib/mail.php:583
+#: lib/mail.php:589
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "現在%1$s在%2$s成為你的粉絲囉"
#. TRANS: Body for favorite notification email
-#: lib/mail.php:586
+#: lib/mail.php:592
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -6139,7 +6146,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:645
+#: lib/mail.php:651
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -6147,13 +6154,13 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:651
+#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:654
+#: lib/mail.php:660
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -6480,7 +6487,7 @@ msgstr ""
msgid "All groups"
msgstr ""
-#: lib/profileformaction.php:114
+#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -6504,7 +6511,7 @@ msgstr ""
msgid "Popular"
msgstr ""
-#: lib/redirectingaction.php:94
+#: lib/redirectingaction.php:95
#, fuzzy
msgid "No return-to arguments."
msgstr "無此文件"
@@ -6528,7 +6535,7 @@ msgstr "無此通知"
msgid "Revoke the \"%s\" role from this user"
msgstr "無此使用者"
-#: lib/router.php:704
+#: lib/router.php:709
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6714,56 +6721,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1083
+#: lib/util.php:1100
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1086
+#: lib/util.php:1103
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1090
+#: lib/util.php:1107
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1093
+#: lib/util.php:1110
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1097
+#: lib/util.php:1114
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1117
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1104
+#: lib/util.php:1121
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1124
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1111
+#: lib/util.php:1128
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1131
msgid "about a year ago"
msgstr ""