summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-12-01 09:48:58 -0500
committerEvan Prodromou <evan@status.net>2010-12-01 09:48:58 -0500
commit86383ecb149578adfeefcf07733616d7fb1f5f13 (patch)
treec0b19100a9ae2327cddef676d17d25c7e416ee90
parentc9493b55d78caa360b4ec3f6ad9a7debc686d377 (diff)
parent18cbdfb49bc2025768b51db7899c897ecadb7072 (diff)
Merge remote branch 'gitorious/0.9.x' into 0.9.x
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po206
-rw-r--r--locale/da/LC_MESSAGES/statusnet.po5023
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po211
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po205
-rw-r--r--locale/eo/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po204
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po231
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po208
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/hu/LC_MESSAGES/statusnet.po205
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po221
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po205
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po208
-rw-r--r--locale/ka/LC_MESSAGES/statusnet.po204
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po208
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po215
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po213
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po209
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po205
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po208
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po221
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po746
-rw-r--r--locale/statusnet.pot199
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po207
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po217
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po208
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po214
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po5652
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po206
-rw-r--r--plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po101
-rw-r--r--plugins/BitlyUrl/BitlyUrlPlugin.php6
-rw-r--r--plugins/BitlyUrl/locale/br/LC_MESSAGES/BitlyUrl.po78
-rw-r--r--plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po78
-rw-r--r--plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po71
-rw-r--r--plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po73
-rw-r--r--plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po71
-rw-r--r--plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po43
-rw-r--r--plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po43
-rw-r--r--plugins/Facebook/locale/Facebook.pot14
-rw-r--r--plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po20
-rw-r--r--plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po24
-rw-r--r--plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po25
-rw-r--r--plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po23
-rw-r--r--plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po540
-rw-r--r--plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po23
-rw-r--r--plugins/FacebookBridge/locale/FacebookBridge.pot18
-rw-r--r--plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po28
-rw-r--r--plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po31
-rw-r--r--plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po53
-rw-r--r--plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po65
-rw-r--r--plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po64
-rw-r--r--plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po38
-rw-r--r--plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po78
-rw-r--r--plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po78
-rw-r--r--plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po756
-rw-r--r--plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po756
-rw-r--r--plugins/OpenID/locale/OpenID.pot19
-rw-r--r--plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po589
-rw-r--r--plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po582
-rw-r--r--plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po31
-rw-r--r--plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po32
-rw-r--r--plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po32
-rw-r--r--plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po582
-rw-r--r--plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po29
-rw-r--r--plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po29
-rw-r--r--plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po580
-rw-r--r--plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po32
-rw-r--r--plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po586
-rw-r--r--plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po32
-rw-r--r--plugins/OpenID/locale/tr/LC_MESSAGES/OpenID.po594
-rw-r--r--plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po32
-rw-r--r--plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po38
-rw-r--r--plugins/PoweredByStatusNet/locale/pl/LC_MESSAGES/PoweredByStatusNet.po39
-rw-r--r--plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po39
-rw-r--r--plugins/RSSCloud/locale/nb/LC_MESSAGES/RSSCloud.po72
-rw-r--r--plugins/Realtime/realtimeupdate.js306
-rw-r--r--plugins/Realtime/realtimeupdate.min.js2
-rw-r--r--plugins/Recaptcha/locale/ja/LC_MESSAGES/Recaptcha.po38
-rw-r--r--plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po37
-rw-r--r--plugins/RegisterThrottle/locale/ru/LC_MESSAGES/RegisterThrottle.po43
-rw-r--r--plugins/Sample/locale/gl/LC_MESSAGES/Sample.po69
-rw-r--r--plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po53
-rw-r--r--plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po54
-rw-r--r--plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po53
-rw-r--r--plugins/SphinxSearch/locale/br/LC_MESSAGES/SphinxSearch.po37
-rw-r--r--plugins/TwitterBridge/locale/TwitterBridge.pot24
-rw-r--r--plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po371
-rw-r--r--plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po29
-rw-r--r--plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po31
-rw-r--r--plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po371
-rw-r--r--plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po28
-rw-r--r--plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po29
-rw-r--r--plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po31
-rw-r--r--plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po31
-rw-r--r--plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po31
-rw-r--r--plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po27
-rw-r--r--plugins/TwitterBridge/twitteradminpanel.php5
116 files changed, 21817 insertions, 6460 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 54e4ff472..5d42ad255 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:38:55+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:46+0000\n"
"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -526,24 +526,13 @@ msgstr "Kon nie die gebruiker opdateer nie."
msgid "Could not find target user."
msgstr "Kon nie die gebruiker opdateer nie."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"spasies bevat nie."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
@@ -551,9 +540,9 @@ msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Nie 'n geldige gebruikersnaam nie."
@@ -562,10 +551,10 @@ msgstr "Nie 'n geldige gebruikersnaam nie."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Tuisblad is nie 'n geldige URL nie."
@@ -573,9 +562,9 @@ msgstr "Tuisblad is nie 'n geldige URL nie."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Volledige naam is te lang (maksimum 255 karakters)."
@@ -588,9 +577,9 @@ msgstr "Volledige naam is te lang (maksimum 255 karakters)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -601,9 +590,9 @@ msgstr[1] "Die beskrywing is te lank (die maksimum is %d karakters)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Ligging is te lank is (maksimum 255 karakters)."
@@ -614,8 +603,8 @@ msgstr "Ligging is te lank is (maksimum 255 karakters)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -624,7 +613,7 @@ msgstr[1] "Te veel aliasse! Die maksimum aantal is %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ongeldige alias: \"%s\""
@@ -633,8 +622,8 @@ msgstr "Ongeldige alias: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
@@ -642,8 +631,8 @@ msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
@@ -836,7 +825,7 @@ msgstr "Gebruiker"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -846,7 +835,7 @@ msgstr "Bynaam"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Wagwoord"
@@ -1927,24 +1916,24 @@ msgstr "Gebruik hierdie vorm om die groep te wysig."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ongeldige alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Dit was nie moontlik om die groep by te werk nie."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Dit was nie moontlik om die aliasse te skep nie."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Opsies is gestoor."
@@ -2090,7 +2079,7 @@ msgid "Cannot normalize that email address"
msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
@@ -3035,11 +3024,11 @@ msgstr "Aanteken"
msgid "Login to site"
msgstr "Teken aan"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Onthou my"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3444,7 +3433,7 @@ msgid "6 or more characters"
msgstr "6 of meer karakters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bevestig"
@@ -3456,11 +3445,11 @@ msgstr "Dieselfde as wagwoord hierbo"
msgid "Change"
msgstr "Wysig"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Wagwoord moet 6 of meer karakters bevat."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Wagwoorde is nie dieselfde nie."
@@ -3821,7 +3810,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3829,7 +3818,7 @@ msgstr "Volledige naam"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Tuisblad"
@@ -3842,7 +3831,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3850,19 +3839,19 @@ msgstr[0] "Skrap applikasie"
msgstr[1] "Skrap applikasie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr ""
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3870,7 +3859,7 @@ msgid "Location"
msgstr "Ligging"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -3921,7 +3910,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4215,7 +4204,7 @@ msgstr "Wagwoord moet 6 of meer karakters bevat."
msgid "Password and confirmation do not match."
msgstr "Wagwoorde is nie dieselfde nie."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
#, fuzzy
msgid "Error setting user."
msgstr "Fout tydens stoor van gebruiker; ongeldig."
@@ -4224,7 +4213,7 @@ msgstr "Fout tydens stoor van gebruiker; ongeldig."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
@@ -4236,7 +4225,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Die registrasie is voltooi"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreer"
@@ -4244,86 +4233,86 @@ msgstr "Registreer"
msgid "Registration not allowed."
msgstr "Registrasie nie toegelaat nie."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Die E-posadres bestaan reeds."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wagwoord."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:439
+#: actions/register.php:438
#, fuzzy
msgid "6 or more characters. Required."
msgstr "6 of meer karakters"
-#: actions/register.php:443
+#: actions/register.php:442
#, fuzzy
msgid "Same as password above. Required."
msgstr "Dieselfde as wagwoord hierbo"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-pos"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4342,7 +4331,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6144,18 +6133,18 @@ msgstr "%s volg niemand nie."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom by %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7223,25 +7212,25 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Geen bevestigingskode."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Gaan na die installeerder."
@@ -7987,6 +7976,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Stuur"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
+"spasies bevat nie."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
#, fuzzy
msgid "Send a notice"
@@ -8235,7 +8244,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Blok hierdie gebruiker van hierdie groep"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Die API-funksie is nie gevind nie."
@@ -8494,17 +8503,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8512,12 +8521,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8525,12 +8534,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8538,12 +8547,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8551,7 +8560,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 6a6b70058..294d50dee 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:38:56+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:47+0000\n"
"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -534,23 +534,13 @@ msgstr "تعذّر تحديد المستخدم المصدر."
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدف."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-#, fuzzy
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -558,9 +548,9 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -569,10 +559,10 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -580,9 +570,9 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -595,9 +585,9 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -612,9 +602,9 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
@@ -625,8 +615,8 @@ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -639,7 +629,7 @@ msgstr[5] "كنيات كيرة! العدد الأقصى هو %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "كنية غير صالحة: \"%s\"."
@@ -648,8 +638,8 @@ msgstr "كنية غير صالحة: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -657,8 +647,8 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -855,7 +845,7 @@ msgstr "الحساب"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -865,7 +855,7 @@ msgstr "الاسم المستعار"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمة السر"
@@ -1951,24 +1941,24 @@ msgstr "استخدم هذا النموذج لتعديل المجموعة."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "كنية غير صالحة: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "تعذر تحديث المجموعة."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "حُفظت الخيارات."
@@ -2113,7 +2103,7 @@ msgid "Cannot normalize that email address"
msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -3065,11 +3055,11 @@ msgstr "لُج"
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
@@ -3461,7 +3451,7 @@ msgid "6 or more characters"
msgstr "6 أحرف أو أكثر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "أكّد"
@@ -3473,11 +3463,11 @@ msgstr "نفس كلمة السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمة السر 6 حروف أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -3840,7 +3830,7 @@ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أ
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3848,7 +3838,7 @@ msgstr "الاسم الكامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصفحة الرئيسية"
@@ -3862,7 +3852,7 @@ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك ا
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3874,19 +3864,19 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "السيرة"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3894,7 +3884,7 @@ msgid "Location"
msgstr "الموقع"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
@@ -3946,7 +3936,7 @@ msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4234,7 +4224,7 @@ msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
msgid "Password and confirmation do not match."
msgstr "كلمتا السر غير متطابقتين."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -4242,7 +4232,7 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
@@ -4254,7 +4244,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -4262,86 +4252,86 @@ msgstr "سجّل"
msgid "Registration not allowed."
msgstr "لا يُسمح بالتسجيل."
-#: actions/register.php:205
+#: actions/register.php:209
#, fuzzy
msgid "You can't register if you don't agree to the license."
msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمة سر غير صالحة."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "نفس كلمة السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "جميع الحقوق محفوظة."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4360,7 +4350,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6149,18 +6139,18 @@ msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7265,25 +7255,25 @@ msgstr ""
"tracking - لم يطبق بعد.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "لا رمز تأكيد."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -8064,6 +8054,29 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "أرسل"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+#, fuzzy
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "أرسل إشعارًا"
@@ -8299,7 +8312,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "لم يتم العثور على وسيلة API."
@@ -8554,17 +8567,17 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8576,12 +8589,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8593,12 +8606,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8610,12 +8623,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8627,7 +8640,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index b9f8b1efe..417ad569f 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:38:57+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:48+0000\n"
"Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
"arz>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -540,22 +540,13 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
msgid "Could not find target user."
msgstr "تعذّر إيجاد المستخدم الهدف."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
@@ -563,9 +554,9 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -574,10 +565,10 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -585,9 +576,9 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -600,9 +591,9 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -617,9 +608,9 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
@@ -630,8 +621,8 @@ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -644,7 +635,7 @@ msgstr[5] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "كنيه غير صالحة: \"%s\""
@@ -653,8 +644,8 @@ msgstr "كنيه غير صالحة: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
@@ -662,8 +653,8 @@ msgstr ""
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -861,7 +852,7 @@ msgstr "الحساب"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -871,7 +862,7 @@ msgstr "الاسم المستعار"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمه السر"
@@ -1969,24 +1960,24 @@ msgstr "استخدم هذا النموذج لتعديل المجموعه."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "كنيه غير صالحة: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "تعذر تحديث المجموعه."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "حُفظت الخيارات."
@@ -2136,7 +2127,7 @@ msgid "Cannot normalize that email address"
msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
@@ -3096,11 +3087,11 @@ msgstr "لُج"
msgid "Login to site"
msgstr "لُج إلى الموقع"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "تذكّرني"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3492,7 +3483,7 @@ msgid "6 or more characters"
msgstr "6 حروف أو أكثر. مطلوب."
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "أكّد"
@@ -3504,11 +3495,11 @@ msgstr "نفس كلمه السر أعلاه"
msgid "Change"
msgstr "غيّر"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "كلمتا السر غير متطابقتين."
@@ -3868,7 +3859,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3876,7 +3867,7 @@ msgstr "الاسم الكامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصفحه الرئيسية"
@@ -3889,7 +3880,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3901,19 +3892,19 @@ msgstr[4] "صِف نفسك واهتماماتك"
msgstr[5] "صِف نفسك واهتماماتك"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "صِف نفسك واهتماماتك"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "السيرة"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3921,7 +3912,7 @@ msgid "Location"
msgstr "الموقع"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -3973,7 +3964,7 @@ msgstr "أشرك المستخدمين الجدد بهذا المستخدم تل
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4262,7 +4253,7 @@ msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
msgid "Password and confirmation do not match."
msgstr "كلمتا السر غير متطابقتين."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "خطأ أثناء ضبط المستخدم."
@@ -4270,7 +4261,7 @@ msgstr "خطأ أثناء ضبط المستخدم."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
@@ -4282,7 +4273,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -4290,85 +4281,85 @@ msgstr "سجّل"
msgid "Registration not allowed."
msgstr "لا يُسمح بالتسجيل."
-#: actions/register.php:205
+#: actions/register.php:209
#, fuzzy
msgid "You can't register if you don't agree to the license."
msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "اسم مستخدم أو كلمه سر غير صالحه."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 حروف أو أكثر. مطلوب."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "نفس كلمه السر أعلاه. مطلوب."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "البريد الإلكتروني"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4387,7 +4378,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6185,18 +6176,18 @@ msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعا
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم فى %1$s يا @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7289,25 +7280,25 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "لا رمز تأكيد."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -8068,6 +8059,28 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "أرسل"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "أرسل إشعارًا"
@@ -8303,7 +8316,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "الـ API method مش موجوده."
@@ -8561,17 +8574,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8583,12 +8596,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8600,12 +8613,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8617,12 +8630,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8634,7 +8647,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 38fecfbde..ec3a3f244 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:38:59+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:49+0000\n"
"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -526,24 +526,13 @@ msgstr "Целевият потребител не беше открит."
msgid "Could not find target user."
msgstr "Целевият потребител не беше открит."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
-"между тях."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -551,9 +540,9 @@ msgstr "Опитайте друг псевдоним, този вече е за
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неправилен псевдоним."
@@ -562,10 +551,10 @@ msgstr "Неправилен псевдоним."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Адресът на личната страница не е правилен URL."
@@ -573,9 +562,9 @@ msgstr "Адресът на личната страница не е правил
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -588,9 +577,9 @@ msgstr "Пълното име е твърде дълго (макс. 255 знак
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -601,9 +590,9 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -614,8 +603,8 @@ msgstr "Името на местоположението е твърде дъл
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -624,7 +613,7 @@ msgstr[1] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Неправилен псевдоним: \"%s\""
@@ -633,8 +622,8 @@ msgstr "Неправилен псевдоним: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Псевдонимът \"%s\" вече е зает. Опитайте друг."
@@ -642,8 +631,8 @@ msgstr "Псевдонимът \"%s\" вече е зает. Опитайте д
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -839,7 +828,7 @@ msgstr "Сметка"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -849,7 +838,7 @@ msgstr "Псевдоним"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Парола"
@@ -1939,25 +1928,25 @@ msgstr "Използвайте тази бланка за създаване н
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Неправилен псевдоним: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Грешка при обновяване на групата."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
#, fuzzy
msgid "Could not create aliases."
msgstr "Грешка при отбелязване като любима."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Настройките са запазени."
@@ -2105,7 +2094,7 @@ msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилен адрес на е-поща."
@@ -3089,11 +3078,11 @@ msgstr "Вход"
msgid "Login to site"
msgstr "Вход в сайта"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Запомни ме"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
@@ -3497,7 +3486,7 @@ msgid "6 or more characters"
msgstr "6 или повече знака"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Потвърждаване"
@@ -3509,11 +3498,11 @@ msgstr "Също като паролата по-горе"
msgid "Change"
msgstr "Промяна"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Паролата трябва да е 6 или повече знака."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Паролите не съвпадат."
@@ -3872,7 +3861,7 @@ msgstr "От 1 до 64 малки букви или цифри, без пунк
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3880,7 +3869,7 @@ msgstr "Пълно име"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична страница"
@@ -3894,7 +3883,7 @@ msgstr "Адрес на личната ви страница, блог или п
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3902,19 +3891,19 @@ msgstr[0] "Опишете себе си и интересите си в до %d
msgstr[1] "Опишете себе си и интересите си в до %d букви"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Опишете себе си и интересите си"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "За мен"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3922,7 +3911,7 @@ msgid "Location"
msgstr "Местоположение"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Къде се намирате (град, община, държава и т.н.)"
@@ -3975,7 +3964,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4254,7 +4243,7 @@ msgstr "Паролата трябва да е от поне 6 знака."
msgid "Password and confirmation do not match."
msgstr "Паролата и потвърждението й не съвпадат."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Грешка в настройките на потребителя."
@@ -4262,7 +4251,7 @@ msgstr "Грешка в настройките на потребителя."
msgid "New password successfully saved. You are now logged in."
msgstr "Новата парола е запазена. Влязохте успешно."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
@@ -4275,7 +4264,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -4283,86 +4272,86 @@ msgstr "Регистриране"
msgid "Registration not allowed."
msgstr "Записването не е позволено."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Не можете да се регистрате, ако не сте съгласни с лиценза."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Адресът на е-поща вече се използва."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Неправилно име или парола."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
"поле."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 или повече знака. Задължително поле."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Същото като паролата по-горе. Задължително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Е-поща"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Използва се само за промени, обяви или възстановяване на паролата"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4395,7 +4384,7 @@ msgstr ""
"Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
"само приятни мигове!"
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6186,18 +6175,18 @@ msgstr "%1$s вече получава бележките ви в %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7260,26 +7249,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Не е открит файл с настройки. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Изпратени са покани до следните хора:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -8027,6 +8016,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Прати"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
+"между тях."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Изпращане на бележка"
@@ -8263,7 +8272,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Списък с потребителите в тази група."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Не е открит методът в API."
@@ -8518,17 +8527,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8536,12 +8545,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "преди около час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8549,12 +8558,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8562,12 +8571,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "преди около месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8575,7 +8584,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 92d3cbced..b9bb16d80 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:49+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -531,23 +531,13 @@ msgstr "Diposubl eo termeniñ an implijer mammenn."
msgid "Could not find target user."
msgstr "Diposubl eo kavout an implijer pal."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-#, fuzzy
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -555,9 +545,9 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "N'eo ket ul lesanv mat."
@@ -566,10 +556,10 @@ msgstr "N'eo ket ul lesanv mat."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -577,9 +567,9 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
@@ -592,9 +582,9 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -605,9 +595,9 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
@@ -618,8 +608,8 @@ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -628,7 +618,7 @@ msgstr[1] "Re a aliasoù ! %d d'ar muiañ."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias fall : \"%s\"."
@@ -637,8 +627,8 @@ msgstr "Alias fall : \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
@@ -646,8 +636,8 @@ msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
@@ -840,7 +830,7 @@ msgstr "Kont"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -850,7 +840,7 @@ msgstr "Lesanv"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Ger-tremen"
@@ -1912,24 +1902,24 @@ msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias fall : \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Diposubl eo hizivaat ar strollad."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Diposubl eo krouiñ an aliasoù."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Enrollet eo bet ho dibarzhioù."
@@ -2077,7 +2067,7 @@ msgid "Cannot normalize that email address"
msgstr "Diposubl eo implijout an ID Jabber-mañ"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -3026,11 +3016,11 @@ msgstr "Kevreañ"
msgid "Login to site"
msgstr "Kevreañ d'al lec'hienn"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Kaout soñj"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
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 "
@@ -3434,7 +3424,7 @@ msgid "6 or more characters"
msgstr "6 arouezenn pe muioc'h"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Kadarnaat"
@@ -3446,11 +3436,11 @@ msgstr "Memestra eget ar ger tremen a-us"
msgid "Change"
msgstr "Kemmañ"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Ne glot ket ar gerioù-tremen."
@@ -3813,7 +3803,7 @@ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3821,7 +3811,7 @@ msgstr "Anv klok"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pajenn degemer"
@@ -3835,7 +3825,7 @@ msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3843,19 +3833,19 @@ msgstr[0] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
msgstr[1] "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Buhezskrid"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3863,7 +3853,7 @@ msgid "Location"
msgstr "Lec'hiadur"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
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\""
@@ -3918,7 +3908,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4203,7 +4193,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
@@ -4211,7 +4201,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
@@ -4225,7 +4215,7 @@ msgstr "Digarezit, kod pedadenn direizh."
msgid "Registration successful"
msgstr "Krouet eo bet ar gont."
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Krouiñ ur gont"
@@ -4233,89 +4223,89 @@ msgstr "Krouiñ ur gont"
msgid "Registration not allowed."
msgstr "N'eo ket aotreet krouiñ kontoù."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr ""
"Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
"gont."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Implijet eo dija ar chomlec'h postel-se."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 arouezenn pe muioc'h. Rekis."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Postel"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
"tremen"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Holl gwrioù miret strizh."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4334,7 +4324,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6110,18 +6100,18 @@ msgstr "Ne heuilh %s den ebet."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Deuet mat da %1$s, @%2$s !"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -6724,7 +6714,7 @@ msgstr "Nullañ"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "gant "
+msgstr " gant "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7164,26 +7154,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "N'eo bet kavet restr kefluniadur ebet. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Pedadennoù bet kaset d'an implijerien da-heul :"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Mont d'ar meziant staliañ"
@@ -7931,6 +7921,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Kas"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+#, fuzzy
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Kas un ali"
@@ -8168,7 +8177,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "N'eo ket bet kavet an hentenn API !"
@@ -8424,17 +8433,17 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8442,12 +8451,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8455,12 +8464,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8468,12 +8477,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8481,7 +8490,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 a56e4d4f0..da80e1954 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:55:53+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:50+0000\n"
"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -543,24 +543,13 @@ msgstr "No s'ha pogut determinar l'usuari d'origen."
msgid "Could not find target user."
msgstr "No s'ha pogut trobar l'usuari de destinació."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"espais."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -568,9 +557,9 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Sobrenom no vàlid."
@@ -579,10 +568,10 @@ msgstr "Sobrenom no vàlid."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "La pàgina personal no és un URL vàlid."
@@ -590,9 +579,9 @@ msgstr "La pàgina personal no és un URL vàlid."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
@@ -605,9 +594,9 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -618,9 +607,9 @@ msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -630,8 +619,8 @@ msgstr "La localització és massa llarga (màx. 255 caràcters)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -640,7 +629,7 @@ msgstr[1] "Hi ha massa àlies! Màxim %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "L'àlies no és vàlid: «%s»."
@@ -649,8 +638,8 @@ msgstr "L'àlies no és vàlid: «%s»."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
@@ -658,8 +647,8 @@ msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "L'àlies no pot ser el mateix que el sobrenom."
@@ -861,7 +850,7 @@ msgstr "Compte"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -871,7 +860,7 @@ msgstr "Sobrenom"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasenya"
@@ -1944,24 +1933,24 @@ msgstr "Utilitza aquest formulari per editar el grup."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "L'àlies no és vàlid «%s»"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "No s'ha pogut actualitzar el grup."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "No s'han pogut crear els àlies."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Configuració guardada."
@@ -2109,7 +2098,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
@@ -3108,11 +3097,11 @@ msgstr "Inici de sessió"
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Recorda'm"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Inicia la sessió automàticament en el futur; no ho activeu en ordinadors "
@@ -3518,7 +3507,7 @@ msgid "6 or more characters"
msgstr "6 o més caràcters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirma"
@@ -3530,11 +3519,11 @@ msgstr "Igual a la contrasenya de dalt"
msgid "Change"
msgstr "Canvia"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Les contrasenyes no coincideixen."
@@ -3901,7 +3890,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3909,7 +3898,7 @@ msgstr "Nom complet"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pàgina personal"
@@ -3923,7 +3912,7 @@ msgstr "URL del teu web, blog o perfil en un altre lloc"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3931,19 +3920,19 @@ msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcters"
msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Feu una descripció personal i interessos"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3951,7 +3940,7 @@ msgid "Location"
msgstr "Ubicació"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
@@ -4006,7 +3995,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4297,7 +4286,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Error en configurar l'usuari."
@@ -4305,7 +4294,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi."
@@ -4317,7 +4306,7 @@ msgstr "El codi d'invitació no és vàlid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -4325,19 +4314,19 @@ msgstr "Registre"
msgid "Registration not allowed."
msgstr "Registre no permès."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "L'adreça de correu electrònic ja existeix."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "El nom d'usuari o la contrasenya no són vàlids."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4345,62 +4334,62 @@ msgstr ""
"Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
"enllaçar a amics i col·legues. "
-#: actions/register.php:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 o més caràcters. Requerit."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correu electrònic"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom llarg, preferiblement el vostre nom «real»"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL del teu web, blog o perfil en un altre lloc"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Entenc que el contingut i les dades de %1$s són privades i confidencials."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Tots els drets reservats."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4410,7 +4399,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4443,7 +4432,7 @@ msgstr ""
"\n"
"Gràcies per registrar-vos-hi i esperem que en gaudiu."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6285,18 +6274,18 @@ msgstr "%1$s ara està seguint %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Us donem la benvinguda a %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7381,26 +7370,26 @@ msgstr ""
"tracking - no s'ha implementat encara.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "No s'ha trobat cap fitxer de configuració. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Podeu voler executar l'instal·lador per corregir-ho."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Vés a l'instal·lador."
@@ -8249,6 +8238,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Envia"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
+"espais."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Envia un avís"
@@ -8485,7 +8494,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca el rol «%s» de l'usuari"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "No s'ha trobat el mètode API!"
@@ -8738,17 +8747,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8756,12 +8765,12 @@ msgstr[0] "aproximadament fa un minut"
msgstr[1] "aproximadament fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8769,12 +8778,12 @@ msgstr[0] "aproximadament fa una hora"
msgstr[1] "aproximadament fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8782,12 +8791,12 @@ msgstr[0] "aproximadament fa un dia"
msgstr[1] "aproximadament fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8795,7 +8804,7 @@ msgstr[0] "aproximadament fa un mes"
msgstr[1] "aproximadament fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 b1c51d73b..355c0d7a2 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:04+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:51+0000\n"
"Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
"2 );\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -539,22 +539,13 @@ msgstr "Nelze určit zdrojového uživatele."
msgid "Could not find target user."
msgstr "Nepodařilo se najít cílového uživatele."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 a žádné mezery."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -562,9 +553,9 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Není platnou přezdívkou."
@@ -573,10 +564,10 @@ msgstr "Není platnou přezdívkou."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Domovská stránka není platná URL."
@@ -584,9 +575,9 @@ msgstr "Domovská stránka není platná URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
@@ -599,9 +590,9 @@ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -613,9 +604,9 @@ msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
@@ -626,8 +617,8 @@ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -637,7 +628,7 @@ msgstr[2] "Příliš mnoho aliasů! Maximálně %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Neplatný alias: \"%s\"."
@@ -646,8 +637,8 @@ msgstr "Neplatný alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" se již používá. Zkuste jiný."
@@ -655,8 +646,8 @@ msgstr "Alias \"%s\" se již používá. Zkuste jiný."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias nemůže být stejný jako přezdívka."
@@ -856,7 +847,7 @@ msgstr "Účet"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -866,7 +857,7 @@ msgstr "Přezdívka"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Heslo"
@@ -1952,24 +1943,24 @@ msgstr "Použijte tento formulář k úpravám skupiny."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Neplatný alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Nelze aktualizovat skupinu."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Nelze vytvořit aliasy."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Nastavení uloženo."
@@ -2115,7 +2106,7 @@ msgid "Cannot normalize that email address"
msgstr "Nepodařilo se normalizovat (kanonizovat) e-mailovou adresu."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
@@ -3107,11 +3098,11 @@ msgstr "Přihlásit"
msgid "Login to site"
msgstr "Přihlásit se na stránky"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Zapamatuj si mě"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
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á více lidí! "
@@ -3513,7 +3504,7 @@ msgid "6 or more characters"
msgstr "6 a více znaků"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Potvrdit"
@@ -3525,11 +3516,11 @@ msgstr "Stejné jako heslo výše"
msgid "Change"
msgstr "Změnit"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Heslo musí být alespoň 6 znaků dlouhé"
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Hesla nesouhlasí"
@@ -3895,7 +3886,7 @@ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3903,7 +3894,7 @@ msgstr "Celé jméno"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
@@ -3917,7 +3908,7 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3926,19 +3917,19 @@ msgstr[1] "Popište sebe a své zájmy"
msgstr[2] "Popište sebe a své zájmy"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Popište sebe a své zájmy"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "O mě"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3946,7 +3937,7 @@ msgid "Location"
msgstr "Umístění"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Místo. Město, stát."
@@ -3999,7 +3990,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4285,7 +4276,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Chyba nastavení uživatele"
@@ -4293,7 +4284,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Litujeme, jen pozvaní se mohou registrovat."
@@ -4305,7 +4296,7 @@ msgstr "Litujeme, neplatný kód pozvánky."
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -4313,19 +4304,19 @@ msgstr "Registrovat"
msgid "Registration not allowed."
msgstr "Registrace není povolena."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Emailová adresa již existuje"
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Neplatné jméno nebo heslo"
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4333,59 +4324,59 @@ msgstr ""
"Pomocí tohoto formuláře můžete vytvořit nový účet. Můžete pak posílat "
"oznámení a propojit se s přáteli a kolegy. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 a více znaků. Nutné."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Stejné jako heslo uvedeno výše. Povinné."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Chápu, že obsah a data %1$S jsou soukromé a důvěrné."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Můj text a soubory jsou copyrightovány %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Můj text a soubory zůstanou pod mým vlastním copyrightem."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Všechna práva vyhrazena."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4394,7 +4385,7 @@ msgstr ""
"Můj text a soubory jsou k dispozici pod %s výjimkou těchto soukromých dat: "
"heslo, e-mailová adresa, IM adresa a telefonní číslo."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4427,7 +4418,7 @@ msgstr ""
"\n"
"Díky za registraci a doufáme, že se vám používání této služby bude líbít."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6256,18 +6247,18 @@ msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Vítejte na %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Nenastaven uživatel pro jednouživatelský mód"
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7344,26 +7335,26 @@ msgstr ""
"tracking - Dosud neimplementován.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Žádný konfigurační soubor nalezen. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Díval jsem se po konfiguračních souborech na těchto místech: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Možná budete chtít spustit instalační program abyste to vyřešili."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Jdi na instalaci."
@@ -8211,6 +8202,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Odeslat"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Přezdívka může obsahovat pouze malá písmena a čísla a žádné mezery."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Poslat oznámení"
@@ -8447,7 +8457,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Odebrat uživateli roli \"%s\""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr " API metoda nebyla nalezena."
@@ -8702,17 +8712,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8721,12 +8731,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8735,12 +8745,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8749,12 +8759,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8763,7 +8773,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 03a641779..d6378f65f 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -10,165 +10,204 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-27 22:19+0000\n"
-"PO-Revision-Date: 2010-09-27 22:41:18+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:52+0000\n"
"Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: da\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 1284-84-94 56::+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
-#. TRANS: Page title
+#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
msgid "Access"
msgstr "Adgang"
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
+#. TRANS: Page notice.
+#: actions/accessadminpanel.php:64
msgid "Site access settings"
msgstr "Indstillinger for adgang til webstedet"
#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
+#: actions/accessadminpanel.php:151
msgid "Registration"
msgstr "Registrering"
-#. TRANS: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. TRANS: Checkbox instructions for admin setting "Private".
+#: actions/accessadminpanel.php:155
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr "Forhindre anonyme brugere (som ikke er logget ind) i at se webstedet?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
+#: actions/accessadminpanel.php:157
msgctxt "LABEL"
msgid "Private"
msgstr "Privat"
-#. TRANS: Checkbox instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+#: actions/accessadminpanel.php:164
msgid "Make registration invitation only."
msgstr "Registreing er kun mulig gennem en invitation"
#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
+#: actions/accessadminpanel.php:166
msgid "Invite only"
msgstr "Kun Inviterede"
-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+#: actions/accessadminpanel.php:173
msgid "Disable new registrations."
msgstr "Forhindre nye registreringer"
#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
+#: actions/accessadminpanel.php:175
msgid "Closed"
msgstr "Lukket"
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191
msgid "Save access settings"
msgstr "Gem adgangsindstillinger"
+#. TRANS: Tooltip for button to save access settings in site admin panel.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
#. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:354
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207
msgctxt "BUTTON"
msgid "Save"
msgstr "Gem"
+#. TRANS: Server error when page not found (404).
#. TRANS: Server error when page not found (404)
#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
msgid "No such page."
msgstr "Siden findes ikke"
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:115
-#: actions/apiaccountupdateprofile.php:106
-#: actions/apiaccountupdateprofilebackgroundimage.php:117
-#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
-#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110
+#: actions/apiaccountupdateprofile.php:103
+#: actions/apiaccountupdateprofilebackgroundimage.php:118
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
+#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
+#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
+#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
+#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
+#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
+#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Ingen bruger fundet."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
+#: actions/all.php:91
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s og venner, side %2$d"
-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %s is user nickname
+#. TRANS: H1 text for page. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
+#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
+#: lib/personalgroupnav.php:103
#, php-format
msgid "%s and friends"
msgstr "%s og venner"
-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
+#. TRANS: %s is user nickname.
+#: actions/all.php:108
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "Feed for venner af %s (RSS 1.0)"
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
+#. TRANS: %s is user nickname.
+#: actions/all.php:117
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "Feed for venner af %s (RSS 1.0)"
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
+#. TRANS: %s is user nickname.
+#: actions/all.php:126
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "Feed for venner af %s (Atom)"
-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. TRANS: Empty list message. %s is a user nickname.
+#: actions/all.php:139
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"Dette er tidslinjen for %s og venner, men ingen har skrevet noget endnu."
-#: actions/all.php:143
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:146
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-"Prøv at abonnere på flere personer, [deltage i en gruppe] (%%action.groups%"
-"%) eller skriv noget selv."
+"Prøv at abonnere på flere personer, [deltage i en gruppe](%%action.groups%%) "
+"eller skriv noget selv."
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:150
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -178,7 +217,11 @@ msgstr ""
"[skriv noget som fanger hans eller hendes opmærksomhed](%%%%action.newnotice%"
"%%%?status_textarea=%3$s)."
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -187,61 +230,80 @@ msgstr ""
"Hvorfor ikke [registrere en konto ](%%%%action.register%%%%) og derefter "
"puffe %s eller sende en meddelelse til hans eller hendes opmærksomhed."
-#. TRANS: H1 text
-#: actions/all.php:182
+#. TRANS: H1 text for page when viewing a list for self.
+#: actions/all.php:188
msgid "You and friends"
msgstr "Du og vennerne"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/apitimelinehome.php:119
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Opdateringer fra %1$s og venner på %2$s!"
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:95
-#: actions/apiaccountupdateprofile.php:98
-#: actions/apiaccountupdateprofilebackgroundimage.php:95
-#: actions/apiaccountupdateprofilecolors.php:119
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
-#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
-#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
+#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
+#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#: actions/apiaccountratelimitstatus.php:69
+#: actions/apiaccountupdatedeliverydevice.php:92
+#: actions/apiaccountupdateprofile.php:94
+#: actions/apiaccountupdateprofilebackgroundimage.php:92
+#: actions/apiaccountupdateprofilecolors.php:115
+#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
+#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
+#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
+#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupshow.php:114 actions/apihelptest.php:84
+#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
+#: actions/apitimelineretweetedtome.php:118
+#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
+#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
msgid "API method not found."
msgstr "API metode ikke fundet."
#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: actions/apiaccountupdatedeliverydevice.php:87
-#: actions/apiaccountupdateprofile.php:90
-#: actions/apiaccountupdateprofilebackgroundimage.php:87
-#: actions/apiaccountupdateprofilecolors.php:111
-#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
-#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
-#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
-#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
-#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
-#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
-#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
+#: actions/apiaccountupdatedeliverydevice.php:83
+#: actions/apiaccountupdateprofile.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:83
+#: actions/apiaccountupdateprofilecolors.php:106
+#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
+#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
+#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
+#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
+#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
+#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
msgid "This method requires a POST."
msgstr "Denne metode kræver en POST."
-#: actions/apiaccountupdatedeliverydevice.php:107
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+#: actions/apiaccountupdatedeliverydevice.php:103
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
@@ -249,354 +311,499 @@ msgstr ""
"Du skal angive en parameter med navnet 'device', med værdien sat til en af "
"følgende: sms, im, none."
-#: actions/apiaccountupdatedeliverydevice.php:134
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130
msgid "Could not update user."
msgstr "Kunne ikke opdatere brugeren."
-#: actions/apiaccountupdateprofile.php:113
-#: actions/apiaccountupdateprofilebackgroundimage.php:195
-#: actions/apiaccountupdateprofilecolors.php:186
-#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "Brugeren har ingen profil."
-#: actions/apiaccountupdateprofile.php:148
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147
msgid "Could not save profile."
msgstr "Kunne ikke gemme profilen."
-#: actions/apiaccountupdateprofilebackgroundimage.php:109
-#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#. TRANS: Form validation error in design settings form. POST should remain untranslated.
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
+#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
#, php-format
msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
-msgstr ""
-"Serveren var ikke i stand til at håndtere så meget POST data (%s bytes) på "
-"grund af sin nuværende konfiguration."
+msgstr[0] ""
+msgstr[1] ""
-#: actions/apiaccountupdateprofilebackgroundimage.php:137
-#: actions/apiaccountupdateprofilebackgroundimage.php:147
-#: actions/apiaccountupdateprofilecolors.php:165
-#: actions/apiaccountupdateprofilecolors.php:175
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171
#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings."
msgstr "Kunne ikke gemme dine design indstillinger."
-#: actions/apiaccountupdateprofilebackgroundimage.php:188
-#: actions/apiaccountupdateprofilecolors.php:143
+#. TRANS: Error displayed when updating design settings fails.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:191
+#: actions/apiaccountupdateprofilecolors.php:139
msgid "Could not update your design."
msgstr "Kunne ikke opdatere dit design."
-#: actions/apiblockcreate.php:106
+#: actions/apiatomservice.php:85
+msgid "Main"
+msgstr ""
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinie"
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
msgstr "Du kan ikke blokere dig selv!"
-#: actions/apiblockcreate.php:127
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126
msgid "Block user failed."
msgstr "Blokering af bruger mislykkedes"
-#: actions/apiblockdestroy.php:115
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113
msgid "Unblock user failed."
msgstr "Ophæv blokering af bruger mislykkedes."
-#: actions/apidirectmessage.php:89
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88
#, php-format
msgid "Direct messages from %s"
msgstr "Direkte beskeder fra %s"
+#. TRANS: Subtitle. %s is a user nickname.
#: actions/apidirectmessage.php:93
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle direkte beskeder, sendt fra %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102
#, php-format
msgid "Direct messages to %s"
msgstr "Direkte beskeder til %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle direkte beskeder, sendt til %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Ingen besked tekst!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Det er for langt. Maksimal besked størrelse er %d tegn."
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+msgstr[1] ""
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Modtager bruger ikke fundet"
-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144
msgid "Can't send direct messages to users who aren't your friend."
msgstr "Kan ikke sende direkte beskeder til brugere, som ikke din ven."
-#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Ingen status fundet med dette ID."
-#: actions/apifavoritecreate.php:121
+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
msgstr "Denne status er allerede en favorit."
+#. TRANS: Client error displayed when marking a notice as favourite fails.
#. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
msgid "Could not create favorite."
msgstr "Kunne ikke oprette favorit."
-#: actions/apifavoritedestroy.php:124
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite."
msgstr "Denne status er ikke en favorit."
-#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
+#. TRANS: Client error displayed when removing a favourite has failed.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "Kunne ikke slette favorit."
-#: actions/apifriendshipscreate.php:110
+#. TRANS: Client error displayed when trying follow who's profile could not be found.
+#: actions/apifriendshipscreate.php:109
msgid "Could not follow user: profile not found."
msgstr "Kunne ikke følge bruger: bruger profil ikke fundet."
-#: actions/apifriendshipscreate.php:119
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#: actions/apifriendshipscreate.php:120
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr "Kunne ikke følge bruger: %s er allerede på din liste."
-#: actions/apifriendshipsdestroy.php:110
+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
+#: actions/apifriendshipsdestroy.php:109
msgid "Could not unfollow user: User not found."
msgstr "Kunne ikke stoppe følgeskab af bruger: Bruger ikke fundet."
+#. TRANS: Client error displayed when trying to unfollow self.
#: actions/apifriendshipsdestroy.php:121
msgid "You cannot unfollow yourself."
msgstr "Du kan ikke ophæve følgeskab til dig selv."
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
-msgstr "To gyldige bruger ID'er eller skærm-navne skal angives."
+#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+#: actions/apifriendshipsexists.php:88
+msgid "Two valid IDs or nick names must be supplied."
+msgstr ""
-#: actions/apifriendshipsshow.php:134
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:131
msgid "Could not determine source user."
msgstr "Kunne ikke finde kilde bruger"
-#: actions/apifriendshipsshow.php:142
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:140
msgid "Could not find target user."
msgstr "Kunne ikke finde mål bruger."
-#: actions/apigroupcreate.php:168 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kaldenavn må kun have små bogstaver og tal og ingen mellemrum."
-
-#: actions/apigroupcreate.php:177 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Kaldenavn allerede er i brug. Prøv med et andet."
-#: actions/apigroupcreate.php:184 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ikke et gyldigt kaldenavn"
-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL adresse."
-#: actions/apigroupcreate.php:209 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
-msgid "Full name is too long (max 255 chars)."
-msgstr "Fulde navn er for langt (max 255 tegn)."
-
-#: actions/apigroupcreate.php:217 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "Beskrivelse er for lang (max %d tegn)."
-
-#: actions/apigroupcreate.php:228 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
-msgstr "Placering er for lang (max 255 tegn)."
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
+msgid "Full name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
-#: actions/apigroupcreate.php:247 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr "Alt for mange aliaser! Maksimum %d."
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
+msgid "Location is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] ""
+msgstr[1] ""
-#: actions/apigroupcreate.php:268
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ugyldigt alias: \"%s\"."
-#: actions/apigroupcreate.php:277 actions/editgroup.php:232
-#: actions/newgroup.php:172
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" er allerede i brug. Prøv med et andet."
-#: actions/apigroupcreate.php:290 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias kan ikke være det samme som kaldenavn."
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
-#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
+#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
msgid "Group not found."
msgstr "Gruppen blev ikke fundet."
+#. TRANS: Server error displayed when trying to join a group the user is already a member of.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Du er allerede medlem af denne gruppe."
+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "Du er blevet blokeret fra denne gruppe af administratoren."
+#. TRANS: Server error displayed when joining a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Kunne ikke tilslutte bruger %1$s til gruppe %2$s."
-#: actions/apigroupleave.php:116
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.
+#: actions/apigroupleave.php:115
msgid "You are not a member of this group."
msgstr "Du er ikke medlem af denne gruppe."
+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:126 actions/leavegroup.php:129
-#: lib/command.php:401
+#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Kunne ikke fjerne brugeren %1$s fra gruppen %2$s."
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#: actions/apigrouplist.php:94
#, php-format
msgid "%s's groups"
msgstr "%s's grupper"
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
+#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#: actions/apigrouplist.php:104
#, php-format
msgid "%1$s groups %2$s is a member of."
msgstr "%1$s grupper som %2$s er medlem af."
-#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#: actions/apigrouplistall.php:88 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s's grupper"
-#: actions/apigrouplistall.php:96
+#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+#: actions/apigrouplistall.php:93
#, php-format
msgid "groups on %s"
msgstr "grupper på %s"
-#: actions/apimediaupload.php:100
+#. TRANS: Client error displayed when uploading a media file has failed.
+#: actions/apimediaupload.php:101
msgid "Upload failed."
msgstr "Upload mislykkedes."
-#: actions/apioauthauthorize.php:101
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+#: actions/apioauthaccesstoken.php:101
+msgid "Invalid request token or verifier."
+msgstr ""
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:107
msgid "No oauth_token parameter provided."
msgstr "Ingen oauth_token parameter angivet."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
-msgstr "Ugyldigt token."
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
+msgid "Invalid request token."
+msgstr ""
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:121
+msgid "Request token already authorized."
+msgstr ""
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:230
-#: 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/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350
#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
+#: lib/designsettings.php:310
msgid "There was a problem with your session token. Try again, please."
msgstr "Der var et problem med din session token. Venligst prøv igen."
-#: actions/apioauthauthorize.php:135
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+#: actions/apioauthauthorize.php:168
msgid "Invalid nickname / password!"
msgstr "Ugyldig kaldenavn / password!"
-#: actions/apioauthauthorize.php:159
-msgid "Database error deleting OAuth application user."
-msgstr "Databasefejl ved sletning af OAuth applikationsbruger."
-
-#: actions/apioauthauthorize.php:185
-msgid "Database error inserting OAuth application user."
-msgstr "Databasefejl ved tilføjelse af OAuth applikationsbruger."
-
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+msgid "Database error inserting oauth_token_association."
msgstr ""
-"Anmodnings-token %s er blevet godkendt. Venligst anvend den til en Adgangs-"
-"token."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Anmodnings-token %s er blevet afvist og trukket tilbage."
+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error when submitting a form with unexpected information.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:121
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
+#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Uventet formularafsendelse."
-#: actions/apioauthauthorize.php:259
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+#: actions/apioauthauthorize.php:387
msgid "An application would like to connect to your account"
msgstr "En applikation vil gerne forbinde til din konto"
-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404
msgid "Allow or deny access"
msgstr "Tillad eller Afvis adgang"
-#: actions/apioauthauthorize.php:292
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:425
+#, php-format
+msgid ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:433
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -607,243 +814,446 @@ msgstr ""
"strong> dine data for konto %4$s. Du bør kun give adgang til din %4$s konto "
"til tredjemand du stoler på."
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+msgctxt "LEGEND"
msgid "Account"
-msgstr "Konto"
+msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group nickname (dt). Text hidden by default.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:132
+#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Kaldenavn"
+#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Adgangskode"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Nægt"
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Afbryd"
-#: actions/apioauthauthorize.php:334
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+#: actions/apioauthauthorize.php:485
+msgctxt "BUTTON"
msgid "Allow"
-msgstr "Tillad"
+msgstr ""
+
+#. TRANS: Form instructions.
+#: actions/apioauthauthorize.php:502
+msgid "Authorize access to your account information."
+msgstr ""
+
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+#: actions/apioauthauthorize.php:594
+msgid "Authorization canceled."
+msgstr ""
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#: actions/apioauthauthorize.php:598
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:621
+msgid "You have successfully authorized the application"
+msgstr ""
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
-msgstr "Tillad eller nægte adgang til dine kontooplysninger."
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:625
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:632
+#, php-format
+msgid "You have successfully authorized %s"
+msgstr ""
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:639
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
-#: actions/apistatusesdestroy.php:112
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+#: actions/apistatusesdestroy.php:111
msgid "This method requires a POST or DELETE."
msgstr "Denne metode kræver en POST eller DELETE."
-#: actions/apistatusesdestroy.php:135
+#. TRANS: Client error displayed trying to delete a status of another user.
+#: actions/apistatusesdestroy.php:136
msgid "You may not delete another user's status."
msgstr "Du kan ikke slette en anden brugers status."
-#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/deletenotice.php:61 actions/shownotice.php:92
msgid "No such notice."
msgstr "Ingen sådan meddelelse."
+#. TRANS: Client error displayed trying to repeat an own notice through the API.
#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:84 lib/command.php:538
+#: actions/apistatusesretweet.php:83 lib/command.php:537
msgid "Cannot repeat your own notice."
msgstr "Kan ikke gentage din egen meddelelse."
+#. TRANS: Client error displayed trying to re-repeat a notice through the API.
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:543
msgid "Already repeated that notice."
msgstr "Allerede gentaget denne medelelse."
-#: actions/apistatusesshow.php:139
+#: actions/apistatusesshow.php:117
+msgid "HTTP method not supported."
+msgstr ""
+
+#: actions/apistatusesshow.php:141
+#, php-format
+msgid "Unsupported format: %s"
+msgstr ""
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152
msgid "Status deleted."
msgstr "Status slettet."
-#: actions/apistatusesshow.php:145
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159
msgid "No status with that ID found."
msgstr "Ingen status med dette ID fundet."
-#: actions/apistatusesupdate.php:222
+#: actions/apistatusesshow.php:227
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "Kan ikke slette denne meddelelse."
+
+#: actions/apistatusesshow.php:247
+#, php-format
+msgid "Deleted notice %d"
+msgstr ""
+
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#: actions/apistatusesupdate.php:221
msgid "Client must provide a 'status' parameter with a value."
msgstr "Klienten programmet skal give en \"status\" parameter med en værdi."
-#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
#: lib/mailhandler.php:60
#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Det er for langt. Maksimal besked størrelse er %d tegn."
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] ""
+msgstr[1] ""
-#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
-msgid "Not found."
-msgstr "Ikke fundet."
+#. TRANS: Client error displayed when replying to a non-existing notice.
+#: actions/apistatusesupdate.php:284
+msgid "Parent notice not found."
+msgstr ""
-#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Max meddelelse størrelse er %d tegn, inklusiv vedlagt URL."
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] ""
+msgstr[1] ""
-#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
msgid "Unsupported format."
msgstr "Formatet understøttes ikke"
-#: actions/apitimelinefavorites.php:110
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinefavorites.php:108
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / favoritter fra %2$s"
-#: actions/apitimelinefavorites.php:119
+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#: actions/apitimelinefavorites.php:120
#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%1$s opdateringer favoriseret af %2$s / %2$s."
+msgid "%1$s updates favorited by %2$s / %3$s."
+msgstr ""
-#: actions/apitimelinementions.php:118
+#. TRANS: Server error displayed when generating an Atom feed fails.
+#. TRANS: %s is the error.
+#: actions/apitimelinegroup.php:138
+#, php-format
+msgid "Could not generate feed for group - %s"
+msgstr ""
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinementions.php:115
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / opdateringer nævner %2$s"
+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.
#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s opdateringer, som svar på opdateringer fra %2$s / %3$s."
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentlig tidslinie"
-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s opdateringer fra alle!"
-#: actions/apitimelineretweetedtome.php:111
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+#: actions/apitimelineretweetedbyme.php:71
+msgid "Unimplemented."
+msgstr ""
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#: actions/apitimelineretweetedtome.php:108
#, php-format
msgid "Repeated to %s"
msgstr "Gentagne til %s"
-#: actions/apitimelineretweetsofme.php:114
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#: actions/apitimelineretweetsofme.php:112
#, php-format
msgid "Repeats of %s"
msgstr "Gentaget af %s"
-#: actions/apitimelinetag.php:105 actions/tag.php:67
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Bekendtgørelser tagged med %s"
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#: actions/apitimelinetag.php:105 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Opdateringer tagged med %1$s på %2$s!"
-#: actions/apitrends.php:87
+#: actions/apitimelineuser.php:300
+msgid "Only the user can add to their own timeline."
+msgstr ""
+
+#: actions/apitimelineuser.php:306
+msgid "Only accept AtomPub for atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:316
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#: actions/apitimelineuser.php:325
+msgid "Can only handle post activities."
+msgstr ""
+
+#: actions/apitimelineuser.php:334
+#, php-format
+msgid "Cannot handle activity object type \"%s\""
+msgstr ""
+
+#: actions/apitimelineuser.php:392
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:423
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+
+#. TRANS: Server error for unfinished API method showTrends.
+#: actions/apitrends.php:85
msgid "API method under construction."
msgstr "API metode under udvikling."
+#. TRANS: Client error displayed when requesting user information for a non-existing user.
+#: actions/apiusershow.php:94
+msgid "User not found."
+msgstr ""
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
msgstr "Ingen sådan fil."
-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:116
msgid "No nickname."
msgstr "Ingen kaldenavn."
-#: actions/avatarbynickname.php:64
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+#: actions/avatarbynickname.php:66
msgid "No size."
msgstr "Ingen størrelse."
-#: actions/avatarbynickname.php:69
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+#: actions/avatarbynickname.php:72
msgid "Invalid size."
msgstr "Ugyldig størrelse."
+#. TRANS: Title for avatar upload page.
+#. TRANS: Label for group avatar (dt). Text hidden by default.
#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr "Avatar"
+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
#: actions/avatarsettings.php:78
#, php-format
msgid "You can upload your personal avatar. The maximum file size is %s."
msgstr ""
"Du kan uploade dine personlige avatar. Den maksimale filstørrelse er %s."
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:108
msgid "User without matching profile."
msgstr "Bruger uden matchende profil."
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
#: actions/grouplogo.php:254
msgid "Avatar settings"
msgstr "Avatar indstillinger"
-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
msgstr "Original"
-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
#: actions/grouplogo.php:213 actions/grouplogo.php:274
msgid "Preview"
msgstr "Forhåndsvisning"
-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#. TRANS: Button on avatar upload page to delete current avatar.
+#: actions/avatarsettings.php:155
+msgctxt "BUTTON"
msgid "Delete"
-msgstr "Slet"
+msgstr ""
-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. TRANS: Button on avatar upload page to upload an avatar.
+#: actions/avatarsettings.php:173
+msgctxt "BUTTON"
msgid "Upload"
-msgstr "Oplægge"
+msgstr ""
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+#: actions/avatarsettings.php:243
+msgctxt "BUTTON"
msgid "Crop"
-msgstr "Beskær"
+msgstr ""
-#: actions/avatarsettings.php:305
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+#: actions/avatarsettings.php:318
msgid "No file uploaded."
msgstr "Ingen fil uploaded."
-#: actions/avatarsettings.php:332
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346
msgid "Pick a square area of the image to be your avatar"
msgstr "Vælg en firkantet område af billedet til at være din avatar"
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "Mistede vores fil data."
-#: actions/avatarsettings.php:370
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
msgid "Avatar updated."
msgstr "Avatar opdateret."
-#: actions/avatarsettings.php:373
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389
msgid "Failed updating avatar."
msgstr "Mislykket ajourføring af Avatar."
-#: actions/avatarsettings.php:397
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413
msgid "Avatar deleted."
msgstr "Avatar slettet."
-#: actions/block.php:69
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68
msgid "You already blocked that user."
msgstr "Du har allerede blokeret for denne bruger."
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Bloker bruger"
-#: actions/block.php:138
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+#: actions/block.php:139
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,181 +1265,219 @@ msgstr ""
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
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:157 actions/deleteuser.php:156
+#: actions/block.php:158 actions/deleteuser.php:156
msgid "Do not block this user"
msgstr "Bloker ikke denne bruger"
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
#. TRANS: Button label on the delete notice form.
#. TRANS: Button label on the delete user form.
#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 lib/blockform.php:82
+#: actions/block.php:165 lib/blockform.php:79
msgid "Block this user"
msgstr "Bloker denne bruger"
-#: actions/block.php:187
+#. TRANS: Server error displayed when blocking a user fails.
+#: actions/block.php:189
msgid "Failed to save block information."
msgstr "Kunne ikke gemme blokerings oplysninger."
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
#. TRANS: Command exception text shown when a group is requested that does not exist.
#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
#: actions/groupmembers.php:83 actions/groupmembers.php:90
#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
msgid "No such group."
msgstr "Ingen sådan gruppe."
-#: actions/blockedfromgroup.php:97
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#: actions/blockedfromgroup.php:101
#, php-format
msgid "%s blocked profiles"
msgstr "%s blokerede profiler"
-#: actions/blockedfromgroup.php:100
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#: actions/blockedfromgroup.php:106
#, php-format
msgid "%1$s blocked profiles, page %2$d"
msgstr "%1$s blokerede profiler, side %2$d"
-#: actions/blockedfromgroup.php:115
+#. TRANS: Instructions for list of users blocked from a group.
+#: actions/blockedfromgroup.php:122
msgid "A list of the users blocked from joining this group."
msgstr "En liste over brugere blokeret fra at deltage i denne gruppe."
-#: actions/blockedfromgroup.php:288
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291
msgid "Unblock user from group"
msgstr "Ophæv blokering af bruger fra gruppe"
-#. TRANS: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. TRANS: Button text for unblocking a user from a group.
+#: actions/blockedfromgroup.php:323
+msgctxt "BUTTON"
msgid "Unblock"
-msgstr "Fjern blokering"
+msgstr ""
+#. TRANS: Tooltip for button for unblocking a user from a group.
#. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
+#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
msgid "Unblock this user"
msgstr "Fjern blokeringen af denne bruger"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
#: actions/bookmarklet.php:51
#, php-format
msgid "Post to %s"
msgstr "Post til %s"
-#: actions/confirmaddress.php:75
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+#: actions/confirmaddress.php:74
msgid "No confirmation code."
msgstr "Ingen bekræftelseskode."
+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
msgstr "Bekræftelseskode ikke fundet."
-#: actions/confirmaddress.php:85
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86
msgid "That confirmation code is not for you!"
msgstr "Denne bekræftelseskode er ikke til dig!"
-#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92
#, php-format
msgid "Unrecognized address type %s."
msgstr "Ukendte adresse type %s."
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
msgid "That address has already been confirmed."
msgstr "Denne adresse er allerede blevet bekræftet."
+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
#. TRANS: Server error thrown on database error updating e-mail preferences.
#. TRANS: Server error thrown on database error removing a registered e-mail address.
#. TRANS: Server error thrown on database error updating IM preferences.
#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:116 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:337
+#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Kunne ikke opdatere brugeren."
-#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:437
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
-msgstr "Kunne ikke slette e-mail bekræftelse."
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+#: actions/confirmaddress.php:132
+msgid "Could not delete address confirmation."
+msgstr ""
-#: actions/confirmaddress.php:146
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
msgid "Confirm address"
msgstr "Bekræft adresse"
-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
msgstr "Adressen \"%s\" er blevet bekræftet for din konto."
-#: actions/conversation.php:99
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96
msgid "Conversation"
msgstr "Samtale"
-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Bekendtgørelser"
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
msgid "You must be logged in to delete an application."
msgstr "Du skal være logget ind for at slette et program."
+#. TRANS: Client error displayed trying to delete an application that does not exist.
#: actions/deleteapplication.php:71
msgid "Application not found."
msgstr "Program ikke fundet."
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
#: actions/showapplication.php:94
msgid "You are not the owner of this application."
msgstr "Du er ikke ejer af dette program."
#. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1320
+#: actions/deleteapplication.php:102 actions/editapplication.php:131
+#: actions/newapplication.php:114 actions/showapplication.php:118
+#: lib/action.php:1409
msgid "There was a problem with your session token."
msgstr "Der var et problem med din session token."
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
msgid "Delete application"
msgstr "Slet program"
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
msgid ""
"Are you sure you want to delete this application? This will clear all data "
"about the application from the database, including all existing user "
@@ -1039,31 +1487,85 @@ msgstr ""
"anvendelsen fra databasen, herunder alle eksisterende bruger indstillinger."
#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
msgid "Do not delete this application"
msgstr "Slet ikke dette program"
#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
msgid "Delete this application"
msgstr "Slet dette program"
+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+msgid "You must be logged in to delete a group."
+msgstr ""
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "Ingen brugernavn eller ID."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+msgid "You are not allowed to delete this group."
+msgstr ""
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, php-format
+msgid "Could not delete group %s."
+msgstr ""
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, php-format
+msgid "Deleted group %s"
+msgstr ""
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+msgid "Delete group"
+msgstr ""
+
+#. TRANS: Warning in form for deleleting a group.
+#: actions/deletegroup.php:206
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+msgid "Do not delete this group"
+msgstr ""
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+msgid "Delete this group"
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: 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/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Ikke logget ind"
-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-msgstr "Kan ikke slette denne meddelelse."
-
-#: actions/deletenotice.php:103
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
@@ -1071,21 +1573,24 @@ msgstr ""
"Du er ved permanent at slette en meddelelse. Når dette er gjort, kan det "
"ikke fortrydes."
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
msgid "Delete notice"
msgstr "Slet meddelelse"
-#: actions/deletenotice.php:144
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
msgid "Are you sure you want to delete this notice?"
msgstr "Er du sikker på du vil slette denne meddelelse?"
#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
+#: actions/deletenotice.php:159
msgid "Do not delete this notice"
msgstr "Slet ikke denne meddelelse"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:657
+#: actions/deletenotice.php:166 lib/noticelist.php:672
msgid "Delete this notice"
msgstr "Slet denne meddelelse"
@@ -1116,7 +1621,7 @@ msgstr "Slet denne bruger"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "Design"
@@ -1124,53 +1629,63 @@ msgstr "Design"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:335
msgid "Invalid logo URL."
msgstr "Ugyldig logo URL."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:340
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#: actions/designadminpanel.php:344
#, php-format
msgid "Theme not available: %s."
msgstr "Tema ikke tilgængelige: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:448
msgid "Change logo"
msgstr "Skift logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:453
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:457
+msgid "SSL logo"
+msgstr ""
+
+#: actions/designadminpanel.php:469
msgid "Change theme"
msgstr "Skift tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:486
msgid "Site theme"
msgstr "Site tema"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "Tema for webstedet."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:493
msgid "Custom theme"
msgstr "Brugerdefineret tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:497
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan uploade en brugerdefineret StatusNet tema som en. ZIP arkiv."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98
msgid "Change background image"
msgstr "Skift baggrundsbillede"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
-#: lib/designsettings.php:178
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183
msgid "Background"
msgstr "Baggrund"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:522
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1180,76 +1695,84 @@ msgstr ""
"er %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:553
msgid "On"
msgstr "Til"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:570
msgid "Off"
msgstr "Fra"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+#. TRANS: use of the uploaded profile image.
+#: actions/designadminpanel.php:571 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "Slå baggrundsbilledet til eller fra."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
msgid "Tile background image"
msgstr "Tile baggrundsbillede"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175
msgid "Change colours"
msgstr "Skift farver"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197
msgid "Content"
msgstr "Indhold"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211
msgid "Sidebar"
msgstr "Sidebar"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239
msgid "Links"
msgstr "Henvisninger"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:677
msgid "Advanced"
msgstr "Avanceret"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:681
msgid "Custom CSS"
msgstr "Personlig CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257
msgid "Use defaults"
msgstr "Brug standardindstillinger"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "Gendan standard indstillinger"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "Nulstil til standard værdier"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
-#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:295
-#: lib/applicationeditform.php:356 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357
msgid "Save"
msgstr "Gem"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272
msgid "Save design"
msgstr "Gem design"
@@ -1266,109 +1789,130 @@ msgstr "Tilføj til favoritter"
msgid "No such document \"%s\""
msgstr "Ingen sådan dokument \"%s\""
-#: actions/editapplication.php:54
-msgid "Edit Application"
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+#: actions/editapplication.php:54 lib/applicationeditform.php:129
+#, fuzzy
+msgid "Edit application"
msgstr "Rediger program"
+#. TRANS: Client error displayed trying to edit an application while not logged in.
#: actions/editapplication.php:66
msgid "You must be logged in to edit an application."
msgstr "Du skal være logget ind for at redigere et program."
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87
msgid "No such application."
msgstr "Ingen sådan program"
-#: actions/editapplication.php:161
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167
msgid "Use this form to edit your application."
msgstr "Brug denne formular til at redigere dit program."
-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163
msgid "Name is required."
msgstr "Navn er påkrævet."
-#: actions/editapplication.php:180 actions/newapplication.php:165
-msgid "Name is too long (max 255 chars)."
-msgstr "Navnet er for langt (max 255 tegn)."
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+msgid "Name is too long (maximum 255 characters)."
+msgstr ""
-#: actions/editapplication.php:183 actions/newapplication.php:162
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166
msgid "Name already in use. Try another one."
msgstr "Navn allerede i brug. Prøv et andet."
-#: actions/editapplication.php:186 actions/newapplication.php:168
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172
msgid "Description is required."
msgstr "Beskrivelse er påkrævet."
-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208
msgid "Source URL is too long."
msgstr "Kilde-URL er for lang."
-#: actions/editapplication.php:200 actions/newapplication.php:185
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193
msgid "Source URL is not valid."
msgstr "Kilde-URL er ikke gyldig."
-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196
msgid "Organization is required."
msgstr "Organisationen er påkrævet."
-#: actions/editapplication.php:206 actions/newapplication.php:191
-msgid "Organization is too long (max 255 chars)."
-msgstr "Organisationen er for lang (max 255 tegn)."
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+msgid "Organization is too long (maximum 255 characters)."
+msgstr ""
-#: actions/editapplication.php:209 actions/newapplication.php:194
+#: actions/editapplication.php:226 actions/newapplication.php:202
msgid "Organization homepage is required."
msgstr "Organisationens hjemmeside er påkrævet."
-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214
msgid "Callback is too long."
msgstr "Callback er for lang."
-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223
msgid "Callback URL is not valid."
msgstr "Tilbagekaldswebadresse er ikke gyldig."
-#: actions/editapplication.php:261
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282
msgid "Could not update application."
msgstr "Kunne ikke opdatere programmet."
-#: actions/editgroup.php:56
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#: actions/editgroup.php:55
#, php-format
msgid "Edit %s group"
msgstr "Rediger %s gruppe"
+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
msgstr "Du skal være logget ind for at oprette en gruppe."
-#: actions/editgroup.php:107 actions/editgroup.php:172
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#: actions/editgroup.php:110 actions/editgroup.php:176
#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
msgid "You must be an admin to edit the group."
msgstr "Du skal være administrator for at redigere gruppen."
-#: actions/editgroup.php:158
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161
msgid "Use this form to edit the group."
msgstr "Brug denne formular til at redigere gruppen."
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Beskrivelsen er for lang (max %d tegn)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ugyldigt alias: \"%s\"."
-#: actions/editgroup.php:258
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Kunne ikke opdatere gruppe."
+#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Kunne ikke oprette aliaser."
-#: actions/editgroup.php:280
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Valg gemt."
@@ -1415,16 +1959,6 @@ msgstr ""
"Afventer bekræftelse på denne adresse. Tjek din indbakke (og spam box!) for "
"en besked med yderligere instruktioner."
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label in the "Edit application" form.
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:350
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Afbryd"
-
#. TRANS: Instructions for e-mail address input form. Do not translate
#. TRANS: "example.org". It is one of the domain names reserved for
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
@@ -1475,81 +2009,81 @@ msgid "Email preferences"
msgstr "Email indstillinger"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:184
+#: actions/emailsettings.php:186
msgid "Send me notices of new subscriptions through email."
msgstr "Send mig meddelelser om nye abonnementer via e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:190
+#: actions/emailsettings.php:192
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send mig email, når nogen har tilføjet min meddelelse som en favorit."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:197
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me a private message."
msgstr "Send mig email, når nogen sender mig en privat besked."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:203
+#: actions/emailsettings.php:205
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send mig email, når nogen sender mig et \"@-svar\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:211
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillad venner at puffe mig og at sende mig en e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:218
msgid "I want to post notices by email."
msgstr "Jeg ønsker at sende meddelelser via e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:225
msgid "Publish a MicroID for my email address."
msgstr "Udgiv et MicroID til min email adresse."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:338
+#: actions/emailsettings.php:346
msgid "Email preferences saved."
msgstr "Email indstillinger gemt."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:357
+#: actions/emailsettings.php:366
msgid "No email address."
msgstr "Ingen e-mail-adresse."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:365
+#: actions/emailsettings.php:374
msgid "Cannot normalize that email address"
msgstr "Kan ikke normalisere denne e-mail adresse"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:370 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikke en gyldig e-mail adresse."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:383
msgid "That is already your email address."
msgstr "Det er allerede din e-mail adresse."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:378
+#: actions/emailsettings.php:387
msgid "That email address already belongs to another user."
msgstr "Denne e-mail adresse tilhører allerede en anden bruger."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:395 actions/imsettings.php:351
+#: actions/emailsettings.php:404 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunne ikke indsætte bekræftelseskode."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:402
+#: actions/emailsettings.php:411
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -1561,50 +2095,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:423 actions/imsettings.php:386
+#: actions/emailsettings.php:432 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen afventende bekræftelse at annullere."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:428
+#: actions/emailsettings.php:437
msgid "That is the wrong email address."
msgstr "Det er den forkerte e-mail adresse."
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/emailsettings.php:446 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "Kunne ikke slette e-mail bekræftelse."
+
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:451
msgid "Email confirmation cancelled."
msgstr "Email bekræftelse aflyst."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:462
+#: actions/emailsettings.php:471
msgid "That is not your email address."
msgstr "Det er ikke din e-mail adresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:492
msgid "The email address was removed."
msgstr "E-mail adressen blev fjernet."
-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:506 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen indkommende e-mail adresse."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:508 actions/emailsettings.php:532
+#: actions/emailsettings.php:517 actions/emailsettings.php:541
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kunne ikke opdatere bruger oplysninger."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:512 actions/smssettings.php:581
+#: actions/emailsettings.php:521 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Indgående e-mail adresse fjernet."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:536 actions/smssettings.php:605
+#: actions/emailsettings.php:545 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny indkommende e-mail adresse tilføjet."
@@ -1612,11 +2152,11 @@ msgstr "Ny indkommende e-mail adresse tilføjet."
msgid "This notice is already a favorite!"
msgstr "Denne meddelelse er allerede en favorit!"
-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144
msgid "Disfavor favorite"
msgstr "Fjern markering som favorit"
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: actions/favorited.php:65 lib/popularnoticesection.php:62
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Populære bekendtgørelser"
@@ -1650,11 +2190,11 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
-"Hvorfor ikke [registrere en konto] (%%action.register%%), og vær den første "
+"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
"til at tilføje en meddelelse til dine favoritter!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118
#, php-format
msgid "%s's favorite notices"
msgstr "%s's favorit bekendtgørelser"
@@ -1723,7 +2263,7 @@ msgstr "Kunne ikke konvertere anmodnings-token til et adgangs-token."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Fjerntjenesten bruger en ukendt version af 0MB protokol."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Fejl ved opdatering af fjernbetjeningsprofil."
@@ -1751,19 +2291,23 @@ msgstr "Du kan ikke tildele brugerroller på dette site."
msgid "User already has this role."
msgstr "Bruger har allerede denne rolle."
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49
#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "Ingen profil specificeret."
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
#: actions/unsubscribe.php:84 lib/profileformaction.php:86
msgid "No profile with that ID."
msgstr "Ingen profil med det ID."
-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/groupblock.php:81 actions/groupunblock.php:82
#: actions/makeadmin.php:81
msgid "No group specified."
msgstr "Ingen gruppe angivet."
@@ -1829,8 +2373,10 @@ msgstr ""
"Tilpas den måde din gruppe vises på, med et baggrundsbillede og en "
"farvepalet efter dit valg."
+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
+#: lib/designsettings.php:405 lib/designsettings.php:427
msgid "Couldn't update your design."
msgstr "Kunne ikke opdatere dit design."
@@ -1850,6 +2396,14 @@ msgstr ""
"Du kan uploade et logo billede til din gruppe. Den maksimale filstørrelse er "
"%s."
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Oplægge"
+
+#: actions/grouplogo.php:289
+msgid "Crop"
+msgstr "Beskær"
+
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
msgstr "Vælg en firkantet område af billedet, der skal logoet."
@@ -1912,15 +2466,6 @@ msgctxt "TOOLTIP"
msgid "Make this user an admin"
msgstr ""
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr "%s tidslinie"
-
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#: actions/grouprss.php:142
#, php-format
@@ -1938,7 +2483,7 @@ msgid "Groups, page %d"
msgstr "Grupper, side %d"
#: actions/groups.php:90
-#, php-format
+#, fuzzy, php-format
msgid ""
"%%%%site.name%%%% groups let you find and talk with people of similar "
"interests. After you join a group you can send messages to all other members "
@@ -1949,8 +2494,8 @@ msgstr ""
"%%%%Site.name%%%% grupperne hjælper dig med at finde og snakke med folk med "
"samme interesser. Når du har tilmeldt sig en gruppe, kan du sende besked til "
"alle andre medlemmer ved hjælp af syntaksen \"! Gruppenavn\". Kan du ikke se "
-"en gruppe, du kan lide? Prøv at [søger efter en] (%%%%action.groupsearch%%%"
-"%) eller [start din egen gruppe!] (%%%%action.newgroup%%%%)"
+"en gruppe, du kan lide? Prøv at [søger efter en](%%%%action.groupsearch%%%%) "
+"eller [start din egen gruppe!](%%%%action.newgroup%%%%)"
#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
msgid "Create a new group"
@@ -1981,7 +2526,7 @@ msgid ""
"If you can't find the group you're looking for, you can [create it](%%action."
"newgroup%%) yourself."
msgstr ""
-"Hvis du ikke kan finde den gruppe du leder efter, kan du [oprette den] (%%"
+"Hvis du ikke kan finde den gruppe du leder efter, kan du [oprette den](%%"
"action.newgroup%%) selv."
#: actions/groupsearch.php:85
@@ -1990,18 +2535,21 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
-"Hvorfor ikke [registrere en konto] (%%action.register%%) og [oprette "
-"gruppen] (%%action.newgroup%%) selv!"
+"Hvorfor ikke [registrere en konto](%%action.register%%) og [oprette gruppen]"
+"(%%action.newgroup%%) selv!"
-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94
msgid "Only an admin can unblock group members."
msgstr "Kun en administrator kan fjerne en blokering af gruppens medlemmer."
-#: actions/groupunblock.php:95
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99
msgid "User is not blocked from group."
msgstr "Brugeren er ikke blokeret fra gruppen."
-#: actions/groupunblock.php:128 actions/unblock.php:86
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86
msgid "Error removing the block."
msgstr "Fejl ved fjernelse af blokkering."
@@ -2019,7 +2567,7 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Du kan sende og modtage meddelelser via Jabber/GTalk [instant messages] (%%"
+"Du kan sende og modtage meddelelser via Jabber/GTalk [instant messages](%%"
"doc.im%%). Konfigurer din adresse og indstillinger nedenfor."
#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
@@ -2088,7 +2636,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Udgiv et MicroID for min Jabber / GTalk adresse."
#. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
msgid "Preferences saved."
msgstr "Indstillinger gemt."
@@ -2168,50 +2716,75 @@ msgstr "Indbakke for %s"
msgid "This is your inbox, which lists your incoming private messages."
msgstr "Dette er din indbakke, der viser dine indgående private beskeder."
-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40
msgid "Invites have been disabled."
msgstr "Invitationer er blevet deaktiveret."
-#: actions/invite.php:41
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44
#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr "Du skal være logget ind for at invitere andre brugere til at bruge %s."
-#: actions/invite.php:72
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#: actions/invite.php:77
#, php-format
-msgid "Invalid email address: %s"
-msgstr "Ugyldig e-mail-adresse: %s"
+msgid "Invalid email address: %s."
+msgstr ""
-#: actions/invite.php:110
-msgid "Invitation(s) sent"
-msgstr "Invitation(er), sendt"
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+msgid "Invitations sent"
+msgstr ""
-#: actions/invite.php:112
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119
msgid "Invite new users"
msgstr "Inviter nye brugere"
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr "Du er allerede tilmeldt disse brugere:"
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+#: actions/invite.php:139
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] ""
+msgstr[1] ""
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#: actions/invite.php:145 actions/invite.php:159
#, php-format
+msgctxt "INVITE"
msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgstr ""
-#: actions/invite.php:136
-msgid ""
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+#: actions/invite.php:153
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""
"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-"Disse mennesker er allerede brugere, og du blev automatisk tilmeldt til dem:"
+msgstr[0] ""
+msgstr[1] ""
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr "Invitation(er) sendt til følgende personer:"
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+#: actions/invite.php:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
+msgstr[1] ""
-#: actions/invite.php:150
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177
msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
@@ -2219,43 +2792,54 @@ msgstr ""
"Du vil få besked, når din inviterede acceptere invitationen og tilmelder sig "
"på netstedet. Tak for at du hjælper os med at vokse!"
-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
"Brug denne formular til at invitere dine venner og kolleger til at bruge "
"denne service."
-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217
msgid "Email addresses"
msgstr "Email-adresser"
-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220
msgid "Addresses of friends to invite (one per line)"
msgstr "Adresser på venner som skal inviteres (en pr linje)"
-#: actions/invite.php:192
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224
msgid "Personal message"
msgstr "Personlig besked"
-#: actions/invite.php:194
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227
msgid "Optionally add a personal message to the invitation."
msgstr "Hvis du vil, kan du tilføje en personlig besked til invitationen."
#. TRANS: Send button for inviting friends
-#: actions/invite.php:198
+#: actions/invite.php:231
msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#: actions/invite.php:263
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s har inviteret dig til at slutte sig til dem på %2$s"
-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:231
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
+#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
+#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
+#. TRANS: to register with the StatusNet site.
+#: actions/invite.php:270
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2317,10 +2901,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Du skal være logget ind for at deltage i en gruppe."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Ingen brugernavn eller ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2331,7 +2911,7 @@ msgid "You must be logged in to leave a group."
msgstr "Du skal være logget på for at forlade en gruppe."
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:389
+#: actions/leavegroup.php:100 lib/command.php:386
msgid "You are not a member of that group."
msgstr "Du er ikke medlem af denne gruppe."
@@ -2361,7 +2941,7 @@ msgid ""
msgstr ""
#: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+msgid "Invalid license title. Maximum length is 255 characters."
msgstr ""
#: actions/licenseadminpanel.php:168
@@ -2464,11 +3044,11 @@ msgstr "Log ind"
msgid "Login to site"
msgstr "Login til webstedet"
-#: actions/login.php:258 actions/register.php:485
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Husk mig"
-#: actions/login.php:259 actions/register.php:487
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisk login fremover, ikke for computere, der deles!"
@@ -2493,8 +3073,7 @@ msgstr "Log ind med dit brugernavn og password."
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Har du ikke et brugernavn endnu? [Register] (%% action.register%%) en ny "
-"konto."
+"Har du ikke et brugernavn endnu? [Register](%%action.register%%) en ny konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2519,74 +3098,78 @@ msgstr "Kan ikke gøre %1$s til admin for gruppen %2$s."
msgid "No current status."
msgstr ""
+#. TRANS: This is the title of the form for adding a new application.
#: actions/newapplication.php:52
-msgid "New Application"
-msgstr "Nyt program"
+msgid "New application"
+msgstr ""
-#: actions/newapplication.php:64
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+#: actions/newapplication.php:65
msgid "You must be logged in to register an application."
msgstr "Du skal være logget ind for at registrere et program."
-#: actions/newapplication.php:143
+#: actions/newapplication.php:147
msgid "Use this form to register a new application."
msgstr "Brug denne formular til at registrere et nyt program."
-#: actions/newapplication.php:176
+#: actions/newapplication.php:184
msgid "Source URL is required."
msgstr "Kilde-URL er påkrævet."
-#: actions/newapplication.php:258 actions/newapplication.php:267
+#: actions/newapplication.php:266 actions/newapplication.php:275
msgid "Could not create application."
msgstr "Kunne ikke oprette programmet."
+#. TRANS: Title for form to create a group.
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ny gruppe"
+#. TRANS: Form instructions for group create form.
#: actions/newgroup.php:110
msgid "Use this form to create a new group."
msgstr "Brug denne formular for at oprette en ny gruppe."
-#: actions/newmessage.php:71 actions/newmessage.php:231
+#: actions/newmessage.php:71 actions/newmessage.php:234
msgid "New message"
msgstr "Ny besked"
#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
msgid "You can't send a message to this user."
msgstr "Du kan ikke sende en besked til denne bruger."
#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
+#: lib/command.php:581
msgid "No content!"
msgstr "Ingen indhold!"
-#: actions/newmessage.php:158
+#: actions/newmessage.php:161
msgid "No recipient specified."
msgstr "Ingen modtager specificeret."
#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:167 lib/command.php:505
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
"Du kan ikke sende en besked til dig selv, bare sig det stille til dig selv i "
"stedet."
-#: actions/newmessage.php:181
+#: actions/newmessage.php:184
msgid "Message sent"
msgstr "Beskeden er sendt"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:188 lib/command.php:513
#, php-format
msgid "Direct message to %s sent."
msgstr "Direkte besked til %s sendt."
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:213 actions/newnotice.php:264
msgid "Ajax Error"
msgstr "Ajax Fejl"
@@ -2594,7 +3177,7 @@ msgstr "Ajax Fejl"
msgid "New notice"
msgstr "Ny meddelelse"
-#: actions/newnotice.php:227
+#: actions/newnotice.php:230
msgid "Notice posted"
msgstr "Meddelelse gemt"
@@ -2622,7 +3205,7 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
-"Vær den første til at [skrive om dette emne] (%%%%action.newnotice%%%%?"
+"Vær den første til at [skrive om dette emne](%%%%action.newnotice%%%%?"
"status_textarea=%s) !"
#: actions/noticesearch.php:124
@@ -2631,8 +3214,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-"Hvorfor ikke [registrere en konto] (%%%%action.register%%%%) og vær den "
-"første til at [skrive om dette emne ] (%%%%action.newnotice%%%%?"
+"Hvorfor ikke [registrere en konto](%%%%action.register%%%%) og vær den "
+"første til at [skrive om dette emne ](%%%%action.newnotice%%%%?"
"status_textarea=%s) !"
#: actions/noticesearchrss.php:96
@@ -2647,10 +3230,9 @@ msgstr "Opdateringer matcher søgeordet \"%1$s\" på %2$s!"
#: actions/nudge.php:85
msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
msgstr ""
-"Denne bruger tillader ikke at blive puffet, eller har ikke bekræftet eller "
-"indstillet sin e-mail endnu."
#: actions/nudge.php:94
msgid "Nudge sent"
@@ -2660,92 +3242,172 @@ msgstr "Puf sendt"
msgid "Nudge sent!"
msgstr "Puf sendt!"
-#: actions/oauthappssettings.php:59
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
msgid "You must be logged in to list your applications."
msgstr "Du skal være logget ind for at liste dine applikationer."
-#: actions/oauthappssettings.php:74
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
msgid "OAuth applications"
msgstr "OAuth programmer"
-#: actions/oauthappssettings.php:85
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
msgid "Applications you have registered"
msgstr "Programmer, du har registreret"
-#: actions/oauthappssettings.php:135
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
#, php-format
msgid "You have not registered any applications yet."
msgstr "Du har ikke registreret nogen programmer endnu."
-#: actions/oauthconnectionssettings.php:72
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
msgid "Connected applications"
msgstr "Tilsluttede programmer"
+#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access your account."
+msgid "The following connections exist for your account."
msgstr ""
-#: actions/oauthconnectionssettings.php:175
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: actions/oauthconnectionssettings.php:168
msgid "You are not a user of that application."
msgstr "Du er ikke bruger af dette program."
-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#: actions/oauthconnectionssettings.php:183
#, php-format
-msgid "Unable to revoke access for app: %s."
+msgid "Unable to revoke access for application: %s."
msgstr ""
-#: actions/oauthconnectionssettings.php:198
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#: actions/oauthconnectionssettings.php:202
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213
msgid "You have not authorized any applications to use your account."
msgstr ""
-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#: actions/oauthconnectionssettings.php:233
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
msgstr ""
+#: actions/oembed.php:80 actions/shownotice.php:100
+#, fuzzy
+msgid "Notice has no profile."
+msgstr "Brugeren har ingen profil."
+
+#: actions/oembed.php:83 actions/shownotice.php:172
+#, fuzzy, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s / favoritter fra %2$s"
+
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:159
+#: actions/oembed.php:168
#, php-format
msgid "Content type %s not supported."
msgstr ""
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:163
+#: actions/oembed.php:172
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#, fuzzy
+msgid "Not a supported data format."
+msgstr "Formatet understøttes ikke"
+
#: actions/opensearch.php:64
msgid "People Search"
msgstr ""
+#: actions/opensearch.php:67
+#, fuzzy
+msgid "Notice Search"
+msgstr "Bekendtgørelser"
+
+#: actions/othersettings.php:59
+#, fuzzy
+msgid "Other settings"
+msgstr "Avatar indstillinger"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
#: actions/othersettings.php:71
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
msgid " (free service)"
msgstr ""
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
msgid "Automatic shortening service to use."
msgstr ""
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
msgid "View profile designs"
msgstr ""
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
msgid "Show or hide profile designs."
msgstr ""
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Ingen gruppe angivet."
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Ingen profil specificeret."
+
#: actions/otp.php:90
msgid "No login token requested."
msgstr ""
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Ugyldigt token."
+
#: actions/otp.php:104
msgid "Login token expired."
msgstr ""
@@ -2764,6 +3426,21 @@ msgstr ""
msgid "This is your outbox, which lists private messages you have sent."
msgstr ""
+#: actions/passwordsettings.php:58
+#, fuzzy
+msgid "Change password"
+msgstr "Skift farver"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Skift farver"
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Adgangskode"
+
#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Gammel adgangskode"
@@ -2777,7 +3454,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:440
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bekræft"
@@ -2789,11 +3466,11 @@ msgstr ""
msgid "Change"
msgstr "Ændre"
-#: actions/passwordsettings.php:154 actions/register.php:237
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:240
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr ""
@@ -2809,103 +3486,287 @@ msgstr ""
msgid "Can't save new password."
msgstr ""
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#, fuzzy
+msgid "Password saved."
+msgstr "Adgangskode"
+
+#. TRANS: Title for Paths admin panel.
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
msgid "Paths"
msgstr ""
-#: actions/pathsadminpanel.php:70
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69
msgid "Path and server settings for this StatusNet site"
msgstr ""
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#: actions/pathsadminpanel.php:155
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s."
+msgstr "Tema ikke tilgængelige: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.
#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:169
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the background directory that could not be written to.
+#: actions/pathsadminpanel.php:171
#, php-format
msgid "Background directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:177
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#: actions/pathsadminpanel.php:181
#, php-format
msgid "Locales directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:183
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+#: actions/pathsadminpanel.php:189
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:238
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
+#, fuzzy
+msgid "Site"
+msgstr "Site logo"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
+#, fuzzy
+msgid "Server"
+msgstr "Gem"
+
+#: actions/pathsadminpanel.php:242
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
+#: actions/pathsadminpanel.php:249
+msgid "Site path."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+msgid "Locale directory"
msgstr ""
-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#: actions/pathsadminpanel.php:256
+msgid "Directory path to locales."
msgstr ""
-#: actions/pathsadminpanel.php:250
+#. TRANS: Checkbox label in Paths admin panel.
+#: actions/pathsadminpanel.php:263
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:265
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:272
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+msgid "Server for themes."
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
+#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+msgid "SSL server"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
+#: actions/pathsadminpanel.php:452
+msgid "SSL path"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:308
+msgid "SSL path to themes (default: /theme/)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
+#: actions/pathsadminpanel.php:461
+msgid "Directory"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:317
+msgid "Directory where themes are located."
msgstr ""
-#: actions/pathsadminpanel.php:320
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:326
+#, fuzzy
+msgid "Avatars"
+msgstr "Avatar"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333
+#, fuzzy
+msgid "Avatar server"
+msgstr "Avatar indstillinger"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:335
+msgid "Server for avatars."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:342
+#, fuzzy
+msgid "Avatar path"
+msgstr "Avatar opdateret."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:344
+msgid "Web path to avatars."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:351
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Avatar slettet."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:353
+msgid "Directory where avatars are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:364
+#, fuzzy
+msgid "Backgrounds"
+msgstr "Baggrund"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+msgid "Server for backgrounds."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:399
+msgid "Web path to backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:408
+msgid "Directory where backgrounds are located."
+msgstr ""
+
+#. TRANS: Fieldset legens in Paths admin panel.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#, fuzzy
+msgid "Attachments"
+msgstr "Ingen vedhæftede filer."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:427
+msgid "Server for attachments."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:436
+msgid "Web path to attachments."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:445
+msgid "Server for attachments on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:454
+msgid "Web path to attachments on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:463
+msgid "Directory where attachments are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:472
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Aldrig"
-#: actions/pathsadminpanel.php:325
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479
+#, fuzzy
+msgid "Sometimes"
+msgstr "Bekendtgørelser"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:481
msgid "Always"
msgstr "Altid"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:485
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
-msgstr ""
-
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+msgid "When to use SSL."
msgstr ""
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:497
+msgid "Server to direct SSL requests to."
msgstr ""
-#: actions/pathsadminpanel.php:352
+#. TRANS: Button title text to store form data in the Paths admin panel.
+#: actions/pathsadminpanel.php:514
msgid "Save paths"
msgstr ""
@@ -2920,105 +3781,226 @@ msgstr ""
msgid "People search"
msgstr ""
+#: actions/peopletag.php:68
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s."
+msgstr "Ikke en gyldig e-mail adresse."
+
+#: actions/peopletag.php:142
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr "Opdateringer tagged med %1$s på %2$s!"
+
+#: actions/postnotice.php:95
+#, fuzzy
+msgid "Invalid notice content."
+msgstr "Ugyldigt token."
+
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/profilesettings.php:71
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61
+#, fuzzy
+msgid "Profile settings"
+msgstr "Email indstillinger"
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102
msgid "Profile information"
msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
msgstr ""
+#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmeside"
-#: actions/profilesettings.php:117 actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+msgid "URL of your homepage, blog, or profile on another site."
msgstr ""
-#: actions/profilesettings.php:122 actions/register.php:468
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+msgstr[1] ""
-#: actions/profilesettings.php:125 actions/register.php:471
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr ""
-#: actions/profilesettings.php:127 actions/register.php:473
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr ""
-#: 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
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167
msgid "Location"
msgstr "Lokation"
-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157
msgid "Share my current location when posting notices"
msgstr ""
-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212
msgid "Tags"
msgstr ""
-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173
msgid "Language"
msgstr ""
-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175
msgid "Preferred language"
msgstr ""
-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185
msgid "Timezone"
msgstr ""
-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187
msgid "What timezone are you normally in?"
msgstr ""
-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#: actions/profilesettings.php:262 actions/register.php:229
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr ""
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+msgid "Language is too long (maximum 50 characters)."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profilesettings.php:295 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Ugyldigt alias: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kunne ikke opdatere bruger oplysninger."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Kunne ikke indsætte bekræftelseskode."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
+#, fuzzy
+msgid "Couldn't save profile."
+msgstr "Kunne ikke gemme profilen."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Kunne ikke opdatere brugeren."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#, fuzzy
+msgid "Settings saved."
+msgstr "Valg gemt."
+
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
msgstr ""
+#: actions/public.php:92
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Kunne ikke oprette aliaser."
+
+#: actions/public.php:130
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "%s offentlig tidslinie"
+
+#: actions/public.php:132 lib/publicgroupnav.php:79
+#, fuzzy
+msgid "Public timeline"
+msgstr "%s offentlig tidslinie"
+
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
@@ -3031,10 +4013,26 @@ msgstr ""
msgid "Public Stream Feed (Atom)"
msgstr ""
+#: actions/public.php:188
+#, fuzzy, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"Dette er tidslinjen for %s og venner, men ingen har skrevet noget endnu."
+
#: actions/public.php:191
msgid "Be the first to post!"
msgstr ""
+#: actions/public.php:195
+#, fuzzy, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
+"til at tilføje en meddelelse til dine favoritter!"
+
#: actions/public.php:242
#, php-format
msgid ""
@@ -3052,24 +4050,61 @@ msgid ""
"tool."
msgstr ""
+#. TRANS: Title for public tag cloud.
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
msgstr ""
-#: actions/publictagcloud.php:63
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#: actions/publictagcloud.php:65
#, php-format
-msgid "These are most popular recent tags on %s "
+msgid "These are most popular recent tags on %s"
msgstr ""
-#: actions/publictagcloud.php:69
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:74
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
-#: actions/publictagcloud.php:72
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#: actions/publictagcloud.php:79
msgid "Be the first to post one!"
msgstr ""
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:87
+#, fuzzy, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
+"til at tilføje en meddelelse til dine favoritter!"
+
+#: actions/publictagcloud.php:146
+#, fuzzy
+msgid "Tag cloud"
+msgstr "Skift farver"
+
+#: actions/recoverpassword.php:36
+#, fuzzy
+msgid "You are already logged in!"
+msgstr "Du har allerede blokeret for denne bruger."
+
+#: actions/recoverpassword.php:62
+#, fuzzy
+msgid "No such recovery code."
+msgstr "Ingen sådan meddelelse."
+
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
msgstr ""
@@ -3078,6 +4113,21 @@ msgstr ""
msgid "Recovery code for unknown user."
msgstr ""
+#: actions/recoverpassword.php:86
+#, fuzzy
+msgid "Error with confirmation code."
+msgstr "Ingen bekræftelseskode."
+
+#: actions/recoverpassword.php:97
+#, fuzzy
+msgid "This confirmation code is too old. Please start again."
+msgstr "Denne bekræftelseskode er ikke til dig!"
+
+#: actions/recoverpassword.php:111
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr "Nuværende bekræftet email-adresse."
+
#: actions/recoverpassword.php:152
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
@@ -3088,10 +4138,25 @@ msgstr ""
msgid "You have been identified. Enter a new password below. "
msgstr ""
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "Adgangskode"
+
+#: actions/recoverpassword.php:191
+#, fuzzy
+msgid "Nickname or email address"
+msgstr "Ingen e-mail-adresse."
+
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr ""
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#, fuzzy
+msgid "Recover"
+msgstr "Fjern"
+
#: actions/recoverpassword.php:208
msgid "Reset password"
msgstr "Nulstil adgangskode"
@@ -3116,6 +4181,11 @@ msgstr ""
msgid "Reset"
msgstr "Afbryd"
+#: actions/recoverpassword.php:252
+#, fuzzy
+msgid "Enter a nickname or email address."
+msgstr "Det er ikke din e-mail adresse."
+
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr ""
@@ -3134,15 +4204,30 @@ msgid ""
"address registered to your account."
msgstr ""
+#: actions/recoverpassword.php:357
+#, fuzzy
+msgid "Unexpected password reset."
+msgstr "Uventet formularafsendelse."
+
#: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+msgid "Password must be 6 characters or more."
msgstr ""
+#: actions/recoverpassword.php:369
+#, fuzzy
+msgid "Password and confirmation do not match."
+msgstr "Ingen afventende bekræftelse at annullere."
+
+#: actions/recoverpassword.php:388 actions/register.php:256
+#, fuzzy
+msgid "Error setting user."
+msgstr "Email indstillinger"
+
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
@@ -3150,68 +4235,102 @@ msgstr ""
msgid "Sorry, invalid invitation code."
msgstr ""
-#: actions/register.php:205
+#: actions/register.php:119
+#, fuzzy
+msgid "Registration successful"
+msgstr "Registrering"
+
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#, fuzzy
+msgid "Register"
+msgstr "Registrering"
+
+#: actions/register.php:142
+#, fuzzy
+msgid "Registration not allowed."
+msgstr "Registrering"
+
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:350
+#: actions/register.php:218
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Denne e-mail adresse tilhører allerede en anden bruger."
+
+#: actions/register.php:251 actions/register.php:273
+#, fuzzy
+msgid "Invalid username or password."
+msgstr "Ugyldig kaldenavn / password!"
+
+#: actions/register.php:351
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:432
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:437
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr ""
+#: actions/register.php:442
+#, fuzzy
+msgid "Same as password above. Required."
+msgstr "Navn er påkrævet."
+
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr ""
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:457
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:518
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:528
+#: actions/register.php:534
#, 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:532
+#: actions/register.php:538
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:535
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
+#: actions/register.php:546
#, 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:583
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3230,7 +4349,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:607
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3252,6 +4371,11 @@ msgstr ""
msgid "Subscribe to a remote user"
msgstr ""
+#: actions/remotesubscribe.php:129
+#, fuzzy
+msgid "User nickname"
+msgstr "Ingen kaldenavn."
+
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
msgstr ""
@@ -3265,7 +4389,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: lib/userprofile.php:411
msgid "Subscribe"
msgstr ""
@@ -3281,15 +4405,74 @@ msgstr ""
msgid "That’s a local profile! Login to subscribe."
msgstr ""
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Kunne ikke konvertere anmodnings-token til et adgangs-token."
+
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
msgstr ""
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "Ingen profil specificeret."
+
+#: actions/repeat.php:76
+#, fuzzy
+msgid "You can't repeat your own notice."
+msgstr "Kan ikke gentage din egen meddelelse."
+
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "Allerede gentaget denne medelelse."
+
+#: actions/repeat.php:114 lib/noticelist.php:691
+#, fuzzy
+msgid "Repeated"
+msgstr "Gentagne til %s"
+
+#: actions/repeat.php:119
+#, fuzzy
+msgid "Repeated!"
+msgstr "Gentagne til %s"
+
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:108
+#, fuzzy, php-format
+msgid "Replies to %s"
+msgstr "Gentaget af %s"
+
#: actions/replies.php:128
#, php-format
msgid "Replies to %1$s, page %2$d"
msgstr ""
+#: actions/replies.php:145
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/replies.php:152
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/replies.php:159
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
+#: actions/replies.php:199
+#, fuzzy, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"Dette er tidslinjen for %s og venner, men ingen har skrevet noget endnu."
+
#: actions/replies.php:204
#, php-format
msgid ""
@@ -3304,6 +4487,36 @@ msgid ""
"newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Opdateringer markeret som favorit af %1$s på %2$s!"
+
+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "Du kan ikke tildele brugerroller på dette site."
+
+#: actions/revokerole.php:82
+#, fuzzy
+msgid "User doesn't have this role."
+msgstr "Bruger har allerede denne rolle."
+
+#: actions/rsd.php:146 actions/version.php:159
+#, fuzzy
+msgid "StatusNet"
+msgstr "Status slettet."
+
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Du kan ikke tildele brugerroller på dette site."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Bruger er allerede blokeret fra gruppen."
+
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:379
@@ -3330,12 +4543,48 @@ msgstr ""
msgid "Turn on debugging output for sessions."
msgstr ""
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Save site settings"
+msgstr "Gem adgangsindstillinger"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Du skal være logget ind for at redigere et program."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Program ikke fundet."
+
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:173
msgid "Icon"
msgstr ""
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "Kaldenavn"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "Organisationen er påkrævet."
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#, fuzzy
+msgid "Description"
+msgstr "Beskrivelse er påkrævet."
+
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448
#: lib/profileaction.php:187
msgid "Statistics"
msgstr ""
@@ -3345,10 +4594,25 @@ msgstr ""
msgid "Created by %1$s - %2$s access by default - %3$d users"
msgstr ""
+#: actions/showapplication.php:213
+#, fuzzy
+msgid "Application actions"
+msgstr "Program ikke fundet."
+
#: actions/showapplication.php:236
msgid "Reset key & secret"
msgstr ""
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:672
+msgid "Delete"
+msgstr "Slet"
+
+#: actions/showapplication.php:261
+#, fuzzy
+msgid "Application info"
+msgstr "Program ikke fundet."
+
#: actions/showapplication.php:263
msgid "Consumer key"
msgstr ""
@@ -3375,6 +4639,36 @@ msgid ""
"signature method."
msgstr ""
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Er du sikker på du vil slette denne meddelelse?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s's favorit bekendtgørelser"
+
+#: actions/showfavorites.php:132
+#, fuzzy
+msgid "Could not retrieve favorite notices."
+msgstr "Kunne ikke oprette favorit."
+
+#: actions/showfavorites.php:171
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/showfavorites.php:178
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/showfavorites.php:185
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
@@ -3388,38 +4682,121 @@ msgid ""
"would add to their favorites :)"
msgstr ""
+#: actions/showfavorites.php:212
+#, fuzzy, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
+"til at tilføje en meddelelse til dine favoritter!"
+
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
msgstr ""
-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75
+#, fuzzy, php-format
+msgid "%s group"
+msgstr "%s's grupper"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#: actions/showgroup.php:79
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s og venner, side %2$d"
+
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220
+#, fuzzy
+msgid "Group profile"
+msgstr "Gruppe logo"
+
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180
msgid "URL"
msgstr ""
-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197
+#, fuzzy
+msgid "Note"
+msgstr "Bekendtgørelser"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304
+#, fuzzy
+msgid "Group actions"
+msgstr "grupper på %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s's grupper"
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402
msgid "Members"
msgstr ""
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:404
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417
msgid "All members"
msgstr ""
-#: actions/showgroup.php:439
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+msgctxt "LABEL"
msgid "Created"
msgstr ""
-#: actions/showgroup.php:455
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+msgctxt "LABEL"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:476
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3429,7 +4806,10 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:486
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3438,33 +4818,119 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515
msgid "Admins"
msgstr ""
-#: actions/showmessage.php:98
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79
+#, fuzzy
+msgid "No such message."
+msgstr "Siden findes ikke"
+
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+#: actions/showmessage.php:97
msgid "Only the sender and recipient may read this message."
msgstr ""
-#: actions/showstream.php:148
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:110
+#, fuzzy, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Opdateringer tagged med %1$s på %2$s!"
+
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118
+#, fuzzy, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Opdateringer tagged med %1$s på %2$s!"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "Status slettet."
+
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, php-format
+msgid "%1$s tagged %2$s"
+msgstr ""
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s og venner, side %2$d"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
+#, fuzzy, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/showstream.php:152
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
#, php-format
msgid "FOAF for %s"
msgstr ""
-#: actions/showstream.php:205
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
+msgstr ""
+
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:207
+#. TRANS: Second sentence of empty list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
"%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3473,7 +4939,9 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3481,10 +4949,36 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "Gentaget af %s"
+
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Du kan ikke tildele brugerroller på dette site."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Bruger er allerede blokeret fra gruppen."
+
+#: actions/siteadminpanel.php:69
+#, fuzzy
+msgid "Basic settings for this StatusNet site"
+msgstr "Design indstillinger for dette StatusNet site."
+
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
msgstr ""
+#: actions/siteadminpanel.php:141
+#, fuzzy
+msgid "You must have a valid contact email address."
+msgstr "Ikke en gyldig e-mail adresse."
+
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
@@ -3502,6 +4996,11 @@ msgstr ""
msgid "General"
msgstr ""
+#: actions/siteadminpanel.php:224
+#, fuzzy
+msgid "Site name"
+msgstr "Site tema"
+
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
@@ -3522,6 +5021,11 @@ msgstr ""
msgid "URL used for credits link in footer of each page"
msgstr ""
+#: actions/siteadminpanel.php:239
+#, fuzzy
+msgid "Contact email address for your site"
+msgstr "Indgående e-mail adresse fjernet."
+
#: actions/siteadminpanel.php:245
msgid "Local"
msgstr ""
@@ -3562,28 +5066,99 @@ msgstr ""
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
+#, fuzzy
+msgid "Site Notice"
+msgstr "Bekendtgørelser"
+
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
msgid "Edit site-wide message"
msgstr ""
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "Kunne ikke gemme dine design indstillinger."
+
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
msgstr ""
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Label for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:176
+#, fuzzy
+msgid "Site notice text"
+msgstr "Slet meddelelse"
+
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
msgstr ""
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
+#, fuzzy
+msgid "Save site notice"
+msgstr "Slet meddelelse"
+
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
+#, fuzzy
+msgid "SMS settings"
+msgstr "Email indstillinger"
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
+#, fuzzy, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Administrer hvordan du får e-mail fra %%site.name%%."
+
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Tema ikke tilgængelige: %s."
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "E-mail adresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
+#, fuzzy
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nuværende bekræftet email-adresse."
+
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr ""
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Ingen bekræftelseskode."
+
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr ""
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bekræft adresse"
+
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
msgid "SMS phone number"
@@ -3594,6 +5169,12 @@ msgstr ""
msgid "Phone number, no punctuation or spaces, with area code"
msgstr ""
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Email indstillinger"
+
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
msgid ""
@@ -3601,6 +5182,72 @@ msgid ""
"from my carrier."
msgstr ""
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Email indstillinger gemt."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+#, fuzzy
+msgid "No phone number."
+msgstr "Ingen bruger fundet."
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+#, fuzzy
+msgid "No carrier selected."
+msgstr "Ingen profil specificeret."
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "Det er allerede din e-mail adresse."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr "Denne e-mail adresse tilhører allerede en anden bruger."
+
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"En bekræftelse kode blev sendt til den e-mail adresse, du har tilføjet. Tjek "
+"din indbakke (og spam box!) for koden og vejledning om, hvordan man bruger "
+"den."
+
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Det er den forkerte e-mail adresse."
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Email bekræftelse aflyst."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
+#, fuzzy
+msgid "That is not your phone number."
+msgstr "Det er ikke din e-mail adresse."
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "E-mail adressen blev fjernet."
+
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
@@ -3635,10 +5282,20 @@ msgstr ""
msgid "Manage snapshot configuration"
msgstr ""
+#: actions/snapshotadminpanel.php:127
+#, fuzzy
+msgid "Invalid snapshot run value."
+msgstr "Ugyldig rolle."
+
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
msgstr ""
+#: actions/snapshotadminpanel.php:144
+#, fuzzy
+msgid "Invalid snapshot report URL."
+msgstr "Ugyldig logo URL."
+
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
msgstr ""
@@ -3671,10 +5328,33 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "Gem adgangsindstillinger"
+
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+#: actions/subedit.php:75
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Du er ikke medlem af denne gruppe."
+
+#. TRANS: Server error displayed when updating a subscription fails with a database error.
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+#: actions/subedit.php:89 classes/Subscription.php:136
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Kunne ikke gemme profilen."
+
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
msgstr ""
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ingen sådan fil."
+
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -3683,46 +5363,93 @@ msgstr ""
msgid "Subscribed"
msgstr ""
-#: actions/subscribers.php:50
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#: actions/subscribers.php:51
#, php-format
msgid "%s subscribers"
msgstr ""
-#: actions/subscribers.php:63
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#: actions/subscribers.php:55
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "%1$s blokerede profiler, side %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+#: actions/subscribers.php:68
msgid "These are the people who listen to your notices."
msgstr ""
-#: actions/subscribers.php:67
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscribers.php:74
#, php-format
msgid "These are the people who listen to %s's notices."
msgstr ""
-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
+"return the favor."
msgstr ""
-#: actions/subscribers.php:110
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#: actions/subscribers.php:120
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr ""
-#: actions/subscriptions.php:52
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscribers.php:129
+#, fuzzy, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
+"til at tilføje en meddelelse til dine favoritter!"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/subscriptions.php:51
#, php-format
msgid "%s subscriptions"
msgstr ""
-#: actions/subscriptions.php:65
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: actions/subscriptions.php:55
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "%1$s og venner, side %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+#: actions/subscriptions.php:68
msgid "These are the people whose notices you listen to."
msgstr ""
-#: actions/subscriptions.php:69
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscriptions.php:74
#, php-format
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:126
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscriptions.php:135
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3732,26 +5459,62 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: actions/subscriptions.php:143 actions/subscriptions.php:149
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:208
+#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:226
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:241
msgid "SMS"
msgstr ""
+#: actions/tag.php:69
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Bekendtgørelser tagged med %s"
+
+#: actions/tag.php:87
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/tag.php:93
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed for venner af %s (RSS 1.0)"
+
+#: actions/tag.php:99
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No ID argument."
+msgstr "Ingen vedhæftede filer."
+
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
msgstr ""
+#: actions/tagother.php:77 lib/userprofile.php:76
+#, fuzzy
+msgid "User profile"
+msgstr "Brugeren har ingen profil."
+
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:103
+#: lib/userprofile.php:107
msgid "Photo"
msgstr ""
@@ -3770,6 +5533,41 @@ msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Kunne ikke gemme profilen."
+
+#: actions/tagother.php:236
+#, fuzzy
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr "Brug denne formular til at redigere dit program."
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Siden findes ikke"
+
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Du har allerede blokeret for denne bruger."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Brugeren har ingen profil."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Brugeren har ingen profil."
+
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile ID in request."
+msgstr "Ingen profil med det ID."
+
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
msgstr ""
@@ -3781,63 +5579,93 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
msgctxt "TITLE"
msgid "User"
msgstr ""
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
msgstr ""
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
-#: lib/personalgroupnav.php:109
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "Udvalgte brugere"
+
+#. TRANS: Field label in user admin panel for setting new user welcome text.
#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:242
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:257
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations"
+msgstr "Kun Inviterede"
+
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
msgid "Whether to allow users to invite new users."
msgstr ""
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
msgid "Save user settings"
msgstr ""
@@ -3852,14 +5680,42 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
+#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
+#, fuzzy
+msgid "License"
+msgstr "Henvisninger"
+
+#: actions/userauthorization.php:217
+#, fuzzy
+msgid "Accept"
+msgstr "Adgang"
+
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Slet denne bruger"
+
#: actions/userauthorization.php:219
msgid "Reject"
msgstr ""
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Slet denne bruger"
+
#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr ""
+#: actions/userauthorization.php:254
+#, fuzzy
+msgid "Subscription authorized"
+msgstr "Du har ikke tilladelse."
+
#: actions/userauthorization.php:256
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -3867,6 +5723,11 @@ msgid ""
"subscription. Your subscription token is:"
msgstr ""
+#: actions/userauthorization.php:266
+#, fuzzy
+msgid "Subscription rejected"
+msgstr "Beskrivelse er påkrævet."
+
#: actions/userauthorization.php:268
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -3894,6 +5755,11 @@ msgstr ""
msgid "Profile URL ‘%s’ is for a local user."
msgstr ""
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "Tilbagekaldswebadresse er ikke gyldig."
+
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
@@ -3904,19 +5770,57 @@ msgstr ""
msgid "Wrong image type for avatar URL ‘%s’."
msgstr ""
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#, fuzzy
+msgid "Profile design"
+msgstr "Gruppe design"
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#, fuzzy
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+"Tilpas den måde din gruppe vises på, med et baggrundsbillede og en "
+"farvepalet efter dit valg."
+
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
msgstr ""
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s og venner, side %2$d"
+
#: actions/usergroups.php:132
msgid "Search for more groups"
msgstr ""
+#: actions/usergroups.php:159
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Brugeren er ikke medlem af gruppen."
+
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:75
+#, fuzzy, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Opdateringer markeret som favorit af %1$s på %2$s!"
+
#: actions/version.php:75
#, php-format
msgid "StatusNet %s"
@@ -3960,79 +5864,155 @@ msgstr ""
msgid "Plugins"
msgstr ""
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:885
+#, fuzzy
+msgid "Version"
+msgstr "Samtale"
+
#: actions/version.php:199
msgid "Author(s)"
msgstr ""
-#: classes/Fave.php:147 lib/favorform.php:140
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
msgid "Favor"
msgstr ""
-#: classes/Fave.php:148
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
#, php-format
-msgid "%s marked notice %s as a favorite."
+msgid "%1$s marked notice %2$s as a favorite."
msgstr ""
#. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:143
+#: classes/File.php:156
#, php-format
msgid "Cannot process URL '%s'"
msgstr ""
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:188
msgid "Robin thinks something is impossible."
msgstr ""
#. TRANS: Message given if an upload is larger than the configured maximum.
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204
#, php-format
msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""
"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
#. TRANS: Message given if an upload would exceed user quota.
-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217
#, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] ""
+msgstr[1] ""
#. TRANS: Message given id an upload would exceed a user's monthly quota.
-#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:211
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229
#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Ugyldig størrelse."
+
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42
+#, fuzzy
+msgid "Group join failed."
+msgstr "Gruppen blev ikke fundet."
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:55
+#, fuzzy
+msgid "Not part of group."
+msgstr "Kunne ikke opdatere gruppe."
#. TRANS: Exception thrown when trying to leave a group fails.
#: classes/Group_member.php:63
msgid "Group leave failed."
msgstr ""
-#: classes/Group_member.php:108 lib/joinform.php:114
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr ""
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
msgid "Join"
msgstr ""
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:112
+#: classes/Group_member.php:117
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42
+#, fuzzy
+msgid "Could not update local group."
+msgstr "Kunne ikke opdatere gruppe."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Kunne ikke oprette aliaser."
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
msgstr ""
#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
+#: classes/Message.php:45
msgid "You are banned from sending direct messages."
msgstr ""
+#. TRANS: Message given when a message could not be stored on the server.
+#: classes/Message.php:62
+#, fuzzy
+msgid "Could not insert message."
+msgstr "Kunne ikke finde mål bruger."
+
+#. TRANS: Message given when a message could not be updated on the server.
+#: classes/Message.php:73
+#, fuzzy
+msgid "Could not update message with new URI."
+msgstr "Kunne ikke opdatere brugeren."
+
#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
#: classes/Notice.php:98
@@ -4040,6 +6020,12 @@ msgstr ""
msgid "No such profile (%1$d) for notice (%2$d)."
msgstr ""
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:193
+#, fuzzy, php-format
+msgid "Database error inserting hashtag: %s"
+msgstr "Databasefejl ved tilføjelse af OAuth applikationsbruger."
+
#. TRANS: Client exception thrown if a notice contains too many characters.
#: classes/Notice.php:265
msgid "Problem saving notice. Too long."
@@ -4063,6 +6049,12 @@ msgid ""
"few minutes."
msgstr ""
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+#: classes/Notice.php:291
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr "Du kan ikke tildele brugerroller på dette site."
+
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
#: classes/Notice.php:358 classes/Notice.php:385
@@ -4070,79 +6062,190 @@ msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:906
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:909
+msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1005
+#: classes/Notice.php:1008
msgid "Problem saving group inbox."
msgstr ""
+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1122
+#, php-format
+msgid "Could not save reply for %1$d, %2$d."
+msgstr ""
+
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1824
+#: classes/Notice.php:1853
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:172 classes/User_group.php:247
+#, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr ""
+
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:737
+#: classes/Profile.php:845
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:746
+#: classes/Profile.php:854
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "Brugeren har ingen profil."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:338
+#, fuzzy
+msgid "Unable to save tag."
+msgstr "Kunne ikke gemme dine design indstillinger."
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+#: classes/Subscription.php:75 lib/oauthstore.php:482
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Denne bruger har blokeret dig fra at abonnere."
+
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
#: classes/Subscription.php:80
msgid "Already subscribed!"
msgstr ""
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Bruger er allerede blokeret fra gruppen."
+
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
#: classes/Subscription.php:171
msgid "Not subscribed!"
msgstr ""
-#: classes/Subscription.php:254
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+#, fuzzy
+msgid "Could not delete self-subscription."
+msgstr "Kunne ikke slette favorit."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: classes/Subscription.php:206
+#, fuzzy
+msgid "Could not delete subscription OMB token."
+msgstr "Kunne ikke slette favorit."
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+#: classes/Subscription.php:218
+#, fuzzy
+msgid "Could not delete subscription."
+msgstr "Kunne ikke slette favorit."
+
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
msgid "Follow"
msgstr ""
-#: classes/Subscription.php:255
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
#, php-format
-msgid "%s is now following %s."
+msgid "%1$s is now following %2$s."
msgstr ""
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:384
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
+#. TRANS: Server exception.
+#: classes/User.php:923
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:927
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:511
+#, fuzzy
+msgid "Could not create group."
+msgstr "Kunne ikke opdatere gruppe."
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:521
+#, fuzzy
+msgid "Could not set group URI."
+msgstr "Kunne ikke opdatere gruppe."
+
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:544
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Kunne ikke opdatere gruppe."
+
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:559
+#, fuzzy
+msgid "Could not save local group info."
+msgstr "Kunne ikke gemme profilen."
+
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104
msgid "Change your profile settings"
msgstr ""
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:111
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Mislykket ajourføring af Avatar."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:118
+#, fuzzy
+msgid "Change your password"
+msgstr "Skift farver"
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:125
msgid "Change email handling"
msgstr ""
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:132
+#, fuzzy
+msgid "Design your profile"
+msgstr "Brugeren har ingen profil."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:139
msgid "Other options"
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141
msgid "Other"
msgstr ""
@@ -4157,114 +6260,214 @@ msgstr ""
msgid "Untitled page"
msgstr ""
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:531
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:537
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:458
+#: lib/action.php:540
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
+#: lib/action.php:542
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
+#. TRANS: Main menu option when logged in for access to user settings
+#: lib/action.php:545
+msgid "Account"
+msgstr "Konto"
+
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
+#: lib/action.php:547
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr ""
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#: lib/action.php:550
+#, fuzzy
+msgid "Connect"
+msgstr "Indhold"
+
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:471
+#: lib/action.php:553
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr ""
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:474 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:478
+#: lib/action.php:560
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:563
+#, fuzzy
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Kun Inviterede"
+
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:569
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Logout from the site"
+msgstr "Tema for webstedet."
+
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:572
+#, fuzzy
+msgctxt "MENU"
+msgid "Logout"
+msgstr "Logo opdateret."
+
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
+#: lib/action.php:577
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:580
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registrering"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:583
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Tema for webstedet."
+
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Henvisninger"
+
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:507
+#: lib/action.php:589
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:510
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:595
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: lib/action.php:598
+#, fuzzy
+msgctxt "MENU"
+msgid "Search"
+msgstr "Sidebar"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:620 lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "Slet meddelelse"
+
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:605
+#: lib/action.php:687
msgid "Local views"
msgstr ""
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:757
+#, fuzzy
+msgid "Page notice"
+msgstr "Populære bekendtgørelser"
+
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
+#: lib/action.php:858
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:864
msgid "Help"
msgstr ""
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:867
+#, fuzzy
+msgid "About"
+msgstr "Konto"
+
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:870
msgid "FAQ"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:875
msgid "TOS"
msgstr ""
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:879
+#, fuzzy
+msgid "Privacy"
+msgstr "Privat"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:882
msgid "Source"
msgstr ""
-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:889
+#, fuzzy
+msgid "Contact"
+msgstr "Indhold"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:921
msgid "StatusNet software license"
msgstr ""
@@ -4272,7 +6475,7 @@ msgstr ""
#. TRANS: Text between [] is a link description, text between () is the link itself.
#. TRANS: Make sure there is no whitespace between "]" and "(".
#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:846
+#: lib/action.php:928
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4280,7 +6483,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:849
+#: lib/action.php:931
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -4289,7 +6492,7 @@ msgstr ""
#. TRANS: Make sure there is no whitespace between "]" and "(".
#. TRANS: Text between [] is a link description, text between () is the link itself.
#. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:856
+#: lib/action.php:938
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4298,68 +6501,80 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:872
+#: lib/action.php:954
msgid "Site content license"
msgstr ""
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:879
+#: lib/action.php:961
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:886
+#: lib/action.php:968
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:890
+#: lib/action.php:972
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer.
#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:904
+#: lib/action.php:1004
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1340
+#, fuzzy
+msgid "Pagination"
+msgstr "Registrering"
+
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1351
msgid "After"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1269
+#: lib/action.php:1361
msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: lib/activity.php:120
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
#. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:203
+#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
msgstr ""
#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:240
+#: lib/activityutils.php:237
msgid "Can't handle embedded XML content yet."
msgstr ""
#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:245
+#: lib/activityutils.php:242
msgid "Can't handle embedded Base64 content yet."
msgstr ""
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Du kan ikke tildele brugerroller på dette site."
+
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:108
msgid "Changes to that panel are not allowed."
@@ -4375,18 +6590,46 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:274
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Kunne ikke gemme dine design indstillinger."
+
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:337
msgid "Basic site configuration"
msgstr ""
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:339
+#, fuzzy
+msgctxt "MENU"
+msgid "Site"
+msgstr "Site logo"
+
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:345
msgid "Design configuration"
msgstr ""
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+#, fuzzy
+msgctxt "MENU"
+msgid "Design"
+msgstr "Design"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:353
+#, fuzzy
+msgid "User configuration"
+msgstr "Ingen bekræftelseskode."
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
msgid "User"
msgstr ""
@@ -4396,6 +6639,24 @@ msgid "Access configuration"
msgstr ""
#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Ingen bekræftelseskode."
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:377
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Ingen bekræftelseskode."
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+#, fuzzy
+msgid "Edit site notice"
+msgstr "Slet meddelelse"
+
+#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:393
msgid "Snapshots configuration"
msgstr ""
@@ -4411,163 +6672,282 @@ msgid "API resource requires read-write access, but you only have read access."
msgstr ""
#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:175
+#: lib/apiauth.php:177
msgid "No application for that consumer key."
msgstr ""
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:212
+#: lib/apiauth.php:219
msgid "Bad access token."
msgstr ""
#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:217
+#: lib/apiauth.php:224
msgid "No user for that token."
msgstr ""
#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
#. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:258 lib/apiauth.php:290
+#: lib/apiauth.php:266 lib/apiauth.php:293
msgid "Could not authenticate you."
msgstr ""
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/apioauthstore.php:45
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/apioauthstore.php:69
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/apioauthstore.php:151
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/apioauthstore.php:186
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+msgid "Database error inserting OAuth application user."
+msgstr "Databasefejl ved tilføjelse af OAuth applikationsbruger."
+
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:285
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:182
+#: lib/apioauthstore.php:290
msgid "Failed to delete revoked token."
msgstr ""
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+#, fuzzy
+msgid "Icon for this application"
+msgstr "Slet ikke dette program"
+
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:200
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
#, php-format
-msgid "Describe your application in %d characters"
-msgstr ""
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:205
+#, fuzzy
+msgid "Describe your application"
+msgstr "Slet program"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Du er ikke ejer af dette program."
+
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "Source URL"
+msgstr "Kilde-URL er for lang."
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:225
+#, fuzzy
+msgid "Organization responsible for this application"
+msgstr "Du er ikke ejer af dette program."
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:234
msgid "URL for the homepage of the organization"
msgstr ""
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:243
msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:270
+#: lib/applicationeditform.php:271
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:287
+#: lib/applicationeditform.php:288
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:289
+#: lib/applicationeditform.php:290
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:313
+#: lib/applicationeditform.php:314
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:335
+#: lib/applicationeditform.php:336
msgid "Default access for this application: read-only, or read-write"
msgstr ""
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:353
+#, fuzzy
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+
#. TRANS: Application access type
-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:260
msgid "read-write"
msgstr ""
#. TRANS: Application access type
-#: lib/applicationlist.php:137
+#: lib/applicationlist.php:262
msgid "read-only"
msgstr ""
-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:143
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:268
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
msgstr ""
+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#: lib/applicationlist.php:282
+#, php-format
+msgid "Access token starting with: %s"
+msgstr ""
+
+#. TRANS: Button label
+#: lib/applicationlist.php:298
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Revoke"
+msgstr "Fjern"
+
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""
+
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:294
msgid "Author"
msgstr ""
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:308
+#, fuzzy
+msgid "Provider"
+msgstr "Forhåndsvisning"
+
#. TRANS: Title.
-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
msgstr ""
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Title.
+#: lib/attachmenttagcloudsection.php:48
+#, fuzzy
+msgid "Tags for this attachment"
+msgstr "Ingen sådan fil."
+
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+msgid "Password changing failed."
msgstr ""
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+msgid "Password changing is not allowed."
msgstr ""
#. TRANS: Title for the form to block a user.
-#: lib/blockform.php:70
+#: lib/blockform.php:68
msgid "Block"
msgstr "Bloker"
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
+#, fuzzy
+msgid "Command results"
+msgstr "Bekræft adresse"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
msgid "Command complete"
msgstr ""
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
+#, fuzzy
+msgid "Command failed"
+msgstr "Du og vennerne"
+
#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:84 lib/command.php:108
+#: lib/command.php:82 lib/command.php:106
msgid "Notice with that id does not exist."
msgstr ""
#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
#. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:101 lib/command.php:630
+#: lib/command.php:99 lib/command.php:630
msgid "User has no last notice."
msgstr ""
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:130
+#: lib/command.php:128
#, php-format
msgid "Could not find a user with nickname %s."
msgstr ""
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:150
+#: lib/command.php:148
#, php-format
msgid "Could not find a local user with nickname %s."
msgstr ""
#. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:185
+#: lib/command.php:183
msgid "Sorry, this command is not yet implemented."
msgstr ""
#. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:231
+#: lib/command.php:229
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:240
+#: lib/command.php:238
#, php-format
msgid "Nudge sent to %s."
msgstr ""
@@ -4576,7 +6956,7 @@ msgstr ""
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
#. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:270
+#: lib/command.php:268
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -4584,155 +6964,249 @@ msgid ""
"Notices: %3$s"
msgstr ""
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312
+#, fuzzy
+msgid "Notice marked as fave."
+msgstr "Denne meddelelse er allerede en favorit!"
+
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:360
+#: lib/command.php:357
#, php-format
msgid "%1$s joined group %2$s."
msgstr ""
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:408
+#: lib/command.php:405
#, php-format
msgid "%1$s left group %2$s."
msgstr ""
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr ""
+
#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:434
+#: lib/command.php:430
#, php-format
msgid "Fullname: %s"
msgstr ""
#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a location.
+#: lib/command.php:434 lib/mail.php:278
#, 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:442 lib/mail.php:271
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a homepage.
+#: lib/command.php:438 lib/mail.php:282
#, php-format
msgid "Homepage: %s"
msgstr ""
#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:446
+#: lib/command.php:442
#, php-format
msgid "About: %s"
msgstr ""
#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488
#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:517
+#: lib/command.php:516
msgid "Error sending direct message."
msgstr ""
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:554
+#: lib/command.php:553
#, php-format
msgid "Notice from %s repeated."
msgstr ""
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:556
+#, fuzzy
+msgid "Error repeating notice."
+msgstr "Fejl ved opdatering af fjernbetjeningsprofil."
+
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:591
#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
#. TRANS: Text shown having sent a reply to a notice successfully.
#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:603
+#: lib/command.php:604
#, php-format
msgid "Reply to %s sent."
msgstr ""
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:607
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Fejl ved opdatering af fjernbetjeningsprofil."
+
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:654
msgid "Specify the name of the user to subscribe to."
msgstr ""
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
+#: lib/command.php:663
msgid "Can't subscribe to OMB profiles by command."
msgstr ""
#. TRANS: Text shown after having subscribed to another user successfully.
#. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:671
#, php-format
msgid "Subscribed to %s."
msgstr ""
#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:692 lib/command.php:803
msgid "Specify the name of the user to unsubscribe from."
msgstr ""
#. TRANS: Text shown after having unsubscribed from another user successfully.
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:703
#, php-format
msgid "Unsubscribed from %s."
msgstr ""
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:723 lib/command.php:749
msgid "Command not yet implemented."
msgstr ""
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+#, fuzzy
+msgid "Notification off."
+msgstr "Ingen bekræftelseskode."
+
#. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:730
msgid "Can't turn off notification."
msgstr ""
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+#, fuzzy
+msgid "Notification on."
+msgstr "Ingen bekræftelseskode."
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:756
+#, fuzzy
+msgid "Can't turn on notification."
+msgstr "Kan ikke gentage din egen meddelelse."
+
#. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:770
msgid "Login command is disabled."
msgstr ""
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:783
#, php-format
msgid "This link is useable only once and is valid for only 2 minutes: %s."
msgstr ""
#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:812
#, php-format
msgid "Unsubscribed %s."
msgstr ""
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Du har ikke tilladelse."
+
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:835
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "You are subscribed to this person:"
+msgstr[1] "You are subscribed to these people:"
+
#. TRANS: Text shown after requesting other users that are subscribed to a user
#. TRANS: (followers) without having any subscribers.
-#: lib/command.php:858
+#: lib/command.php:857
msgid "No one is subscribed to you."
msgstr ""
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:862
+#, fuzzy
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "This person is subscribed to you:"
+msgstr[1] "These people are subscribed to you:"
+
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:884
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du er ikke medlem af denne gruppe."
+
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:889
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "You are a member of this group:"
+msgstr[1] "You are a member of these groups:"
+
#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:905
+#: lib/command.php:904
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4774,51 +7248,133 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:147
+msgid "No configuration file found."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:150
+msgid "I looked for configuration files in the following places:"
msgstr ""
-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:157
msgid "Go to the installer."
msgstr ""
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"
msgid "IM"
msgstr ""
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
msgid "Updates by instant messenger (IM)"
msgstr ""
-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115
msgid "Updates by SMS"
msgstr ""
-#: lib/dberroraction.php:60
+#. TRANS: Menu item for OuAth connection settings.
+#: lib/connectsettingsaction.php:120
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
+#: lib/connectsettingsaction.php:122
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Slet program"
+
+#: lib/dberroraction.php:59
msgid "Database error"
msgstr ""
-#: lib/feed.php:85
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designsettings.php:104
+#, fuzzy
+msgid "Upload file"
+msgstr "Oplægge"
+
+#. TRANS: Instructions for form on profile design page.
+#: lib/designsettings.php:109
+#, fuzzy
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr ""
+"Du kan uploade dine personlige avatar. Den maksimale filstørrelse er %s."
+
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designsettings.php:139
+msgctxt "RADIO"
+msgid "On"
+msgstr ""
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designsettings.php:156
+msgctxt "RADIO"
+msgid "Off"
+msgstr ""
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
+#, fuzzy
+msgid "Design defaults restored."
+msgstr "Design præferencer gemt."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "Slet denne meddelelse"
+
+#: lib/favorform.php:114 lib/favorform.php:143
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Slet denne meddelelse"
+
+#: lib/feed.php:84
msgid "RSS 1.0"
msgstr ""
-#: lib/feed.php:87
+#: lib/feed.php:86
msgid "RSS 2.0"
msgstr ""
-#: lib/feed.php:89
+#: lib/feed.php:88
msgid "Atom"
msgstr ""
-#: lib/feed.php:91
+#: lib/feed.php:90
msgid "FOAF"
msgstr ""
-#: lib/feedlist.php:64
+#. TRANS: Header for feed links (h2).
+#: lib/feedlist.php:66
msgid "Feeds"
msgstr ""
@@ -4826,6 +7382,11 @@ msgstr ""
msgid "Filter tags"
msgstr ""
+#: lib/galleryaction.php:131
+#, fuzzy
+msgid "All"
+msgstr "Tillad"
+
#: lib/galleryaction.php:139
msgid "Select tag to filter"
msgstr ""
@@ -4847,8 +7408,13 @@ msgstr ""
msgid "Grant this user the \"%s\" role"
msgstr ""
+#: lib/groupeditform.php:154
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "Kaldenavn må kun have små bogstaver og tal og ingen mellemrum."
+
#: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
msgstr ""
#: lib/groupeditform.php:168
@@ -4857,18 +7423,26 @@ msgstr ""
#: lib/groupeditform.php:170
#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:86
@@ -4942,11 +7516,20 @@ msgctxt "TOOLTIP"
msgid "Add or edit %s design"
msgstr ""
+#. TRANS: Title for groups with the most members section.
+#: lib/groupsbymemberssection.php:71
+#, fuzzy
+msgid "Groups with most members"
+msgstr "%s gruppe medlemmer"
+
+#. TRANS: Title for groups with the most posts section.
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
msgstr ""
-#: lib/grouptagcloudsection.php:56
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+#: lib/grouptagcloudsection.php:57
#, php-format
msgid "Tags in %s group's notices"
msgstr ""
@@ -4956,26 +7539,66 @@ msgstr ""
msgid "This page is not available in a media type you accept"
msgstr ""
+#: lib/imagefile.php:72
+#, fuzzy
+msgid "Unsupported image file format."
+msgstr "Formatet understøttes ikke"
+
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: lib/imagefile.php:90
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+"Du kan uploade et logo billede til din gruppe. Den maksimale filstørrelse er "
+"%s."
+
+#: lib/imagefile.php:95
+#, fuzzy
+msgid "Partial upload."
+msgstr "Ingen fil uploaded."
+
#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:101 lib/mediafile.php:179
+#: lib/imagefile.php:103 lib/mediafile.php:228
msgid "System error uploading file."
msgstr ""
-#: lib/imagefile.php:109
+#: lib/imagefile.php:111
msgid "Not an image or corrupt file."
msgstr ""
-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:160
+#, fuzzy
+msgid "Lost our file."
+msgstr "Mistede vores fil data."
+
+#: lib/imagefile.php:197 lib/imagefile.php:237
msgid "Unknown file type"
msgstr ""
-#: lib/imagefile.php:244
-msgid "MB"
-msgstr ""
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
-#: lib/imagefile.php:246
-msgid "kB"
-msgstr ""
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
#: lib/jabber.php:387
#, php-format
@@ -4987,6 +7610,11 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Gem"
+
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
msgstr ""
@@ -4995,39 +7623,54 @@ msgstr ""
msgid "Sign up for a new account"
msgstr ""
+#. TRANS: Subject for address confirmation email.
+#: lib/mail.php:174
+#, fuzzy
+msgid "Email address confirmation"
+msgstr "E-mail adresse"
+
#. TRANS: Body for address confirmation email.
-#: lib/mail.php:177
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#: lib/mail.php:179
#, php-format
msgid ""
-"Hey, %s.\n"
+"Hey, %1$s.\n"
"\n"
-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"
"\n"
"If it was you, and you want to confirm your entry, use the URL below:\n"
"\n"
-"\t%s\n"
+"\t%3$s\n"
"\n"
"If not, just ignore this message.\n"
"\n"
"Thanks for your time, \n"
-"%s\n"
+"%2$s\n"
msgstr ""
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:246
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr ""
-#: lib/mail.php:248
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:253
#, 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:254
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
+#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
+#. TRANS: %7$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:263
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5036,20 +7679,31 @@ msgid ""
"\n"
"%4$s%5$s%6$s\n"
"Faithfully yours,\n"
-"%7$s.\n"
+"%2$s.\n"
"\n"
"----\n"
-"Change your email address or notification options at %8$s\n"
+"Change your email address or notification options at %7$s\n"
msgstr ""
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286
#, php-format
msgid "Bio: %s"
msgstr ""
-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315
+#, fuzzy, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+"Opret en ny e-mail adresse til postering af beskeder; annullerer den gamle."
+
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#: lib/mail.php:321
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5059,29 +7713,40 @@ msgid ""
"More email instructions at %3$s.\n"
"\n"
"Faithfully yours,\n"
-"%4$s"
+"%1$s"
msgstr ""
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442
#, php-format
msgid "%s status"
msgstr ""
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468
+#, fuzzy
+msgid "SMS confirmation"
+msgstr "Ingen bekræftelseskode."
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
+#: lib/mail.php:500
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5097,8 +7762,18 @@ msgid ""
"%4$s\n"
msgstr ""
-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547
+#, fuzzy, php-format
+msgid "New private message from %s"
+msgstr "Direkte beskeder fra %s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#: lib/mail.php:555
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5117,8 +7792,19 @@ msgid ""
"%5$s\n"
msgstr ""
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:607
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr ""
+
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#: lib/mail.php:614
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5140,7 +7826,7 @@ msgid ""
msgstr ""
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:651
+#: lib/mail.php:672
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -5148,13 +7834,20 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:657
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:680
#, php-format
-msgid "%s (@%s) sent a notice to your attention"
+msgid "%1$s (@%2$s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
+#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
+#: lib/mail.php:688
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5191,66 +7884,93 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:521
msgid "from"
msgstr ""
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Kunne ikke opdatere brugeren."
+
#: lib/mailhandler.php:42
msgid "Not a registered user."
msgstr ""
+#: lib/mailhandler.php:46
+#, fuzzy
+msgid "Sorry, that is not your incoming email address."
+msgstr "Det er ikke din e-mail adresse."
+
+#: lib/mailhandler.php:50
+#, fuzzy
+msgid "Sorry, no incoming email allowed."
+msgstr "Ingen indkommende e-mail adresse."
+
+#: lib/mailhandler.php:229
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Formatet understøttes ikke"
+
#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:99 lib/mediafile.php:125
+#: lib/mediafile.php:102 lib/mediafile.php:174
msgid "There was a database error while saving your file. Please try again."
msgstr ""
#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:145
+#: lib/mediafile.php:194
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
#. TRANS: Client exception.
-#: lib/mediafile.php:151
+#: lib/mediafile.php:200
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
#. TRANS: Client exception.
-#: lib/mediafile.php:157
+#: lib/mediafile.php:206
msgid "The uploaded file was only partially uploaded."
msgstr ""
#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: lib/mediafile.php:165
+#: lib/mediafile.php:214
msgid "Missing a temporary folder."
msgstr ""
#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: lib/mediafile.php:169
+#: lib/mediafile.php:218
msgid "Failed to write file to disk."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: lib/mediafile.php:173
+#: lib/mediafile.php:222
msgid "File upload stopped by extension."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:189 lib/mediafile.php:232
+#: lib/mediafile.php:238 lib/mediafile.php:281
msgid "File exceeds user's quota."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation fails because the file could
#. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:209 lib/mediafile.php:251
+#: lib/mediafile.php:258 lib/mediafile.php:300
msgid "File could not be moved to destination directory."
msgstr ""
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:265 lib/mediafile.php:306
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr "Kunne ikke finde kilde bruger"
+
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
#. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:340
+#: lib/mediafile.php:394
#, php-format
msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -5259,24 +7979,62 @@ msgstr ""
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:345
+#: lib/mediafile.php:399
#, php-format
msgid "\"%s\" is not a supported file type on this server."
msgstr ""
-#: lib/messageform.php:146
+#: lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Slet meddelelse"
+
+#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
+#: lib/messageform.php:137
+msgid "Select recipient:"
+msgstr ""
+
+#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#: lib/messageform.php:150
+msgid "No mutual subscribers."
+msgstr ""
+
+#: lib/messageform.php:153
msgid "To"
msgstr ""
-#: lib/messageform.php:159 lib/noticeform.php:186
+#: lib/messageform.php:166 lib/noticeform.php:186
msgid "Available characters"
msgstr ""
-#: lib/messageform.php:178 lib/noticeform.php:237
+#: lib/messageform.php:185 lib/noticeform.php:237
msgctxt "Send button for sending notice"
msgid "Send"
msgstr ""
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kaldenavn må kun have små bogstaver og tal og ingen mellemrum."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/noticeform.php:160
+#, fuzzy
+msgid "Send a notice"
+msgstr "Slet meddelelse"
+
#: lib/noticeform.php:174
#, php-format
msgid "What's up, %s?"
@@ -5294,96 +8052,147 @@ msgstr ""
msgid "Share my location"
msgstr ""
+#: lib/noticeform.php:216
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Slet ikke dette program"
+
#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "N"
+msgstr "Nej"
+
#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:453
msgid "S"
msgstr ""
#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:455
msgid "E"
msgstr ""
#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:457
msgid "W"
msgstr ""
-#: lib/noticelist.php:444
+#: lib/noticelist.php:459
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:453
+#: lib/noticelist.php:468
msgid "at"
msgstr ""
-#: lib/noticelist.php:502
+#: lib/noticelist.php:517
msgid "web"
msgstr ""
-#: lib/noticelist.php:568
+#: lib/noticelist.php:583
msgid "in context"
msgstr ""
-#: lib/noticelist.php:631
+#: lib/noticelist.php:618
+#, fuzzy
+msgid "Repeated by"
+msgstr "Gentagne til %s"
+
+#: lib/noticelist.php:645
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Slet denne meddelelse"
+
+#: lib/noticelist.php:646
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:675
+#: lib/noticelist.php:690
msgid "Notice repeated"
msgstr ""
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Slet denne bruger"
+
#: lib/nudgeform.php:128
msgid "Nudge"
msgstr ""
-#: lib/oauthstore.php:283
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Slet denne bruger"
+
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr ""
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr ""
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr ""
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:346
+#: lib/oauthstore.php:362
msgid "Duplicate notice."
msgstr ""
-#: lib/personalgroupnav.php:99
+#: lib/oauthstore.php:507
+#, fuzzy
+msgid "Couldn't insert new subscription."
+msgstr "Kunne ikke indsætte bekræftelseskode."
+
+#: lib/personalgroupnav.php:102
msgid "Personal"
msgstr ""
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107
msgid "Replies"
msgstr ""
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:117
+#, fuzzy
+msgid "Favorites"
+msgstr "Tilføj til favoritter"
+
+#: lib/personalgroupnav.php:128
msgid "Inbox"
msgstr ""
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:129
+#, fuzzy
+msgid "Your incoming messages"
+msgstr "Ingen indkommende e-mail adresse."
+
+#: lib/personalgroupnav.php:133
msgid "Outbox"
msgstr ""
+#: lib/personalgroupnav.php:134
+#, fuzzy
+msgid "Your sent messages"
+msgstr "Direkte beskeder til %s"
+
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
msgstr ""
#. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:116
+#: lib/plugin.php:121
msgid "Unknown"
msgstr ""
@@ -5416,6 +8225,11 @@ msgstr ""
msgid "Daily average"
msgstr ""
+#: lib/profileaction.php:264
+#, fuzzy
+msgid "All groups"
+msgstr "%s's grupper"
+
#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -5424,29 +8238,76 @@ msgstr ""
msgid "Public"
msgstr ""
+#: lib/publicgroupnav.php:82
+#, fuzzy
+msgid "User groups"
+msgstr "%s's grupper"
+
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
msgstr ""
-#: lib/router.php:711
-msgid "No single user defined for single-user mode."
+#: lib/publicgroupnav.php:88
+#, fuzzy
+msgid "Featured"
+msgstr "Udvalgte brugere"
+
+#: lib/publicgroupnav.php:92
+#, fuzzy
+msgid "Popular"
+msgstr "Populære bekendtgørelser"
+
+#: lib/redirectingaction.php:95
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Ingen vedhæftede filer."
+
+#: lib/repeatform.php:107
+#, fuzzy
+msgid "Repeat this notice?"
+msgstr "Slet denne meddelelse"
+
+#: lib/repeatform.php:132
+#, fuzzy
+msgid "Yes"
+msgstr "Ja"
+
+#: lib/repeatform.php:132
+#, fuzzy
+msgid "Repeat this notice"
+msgstr "Slet denne meddelelse"
+
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "Bloker denne bruger fra denne gruppe"
+
+#. TRANS: Client error on action trying to visit a non-existing page.
+#: lib/router.php:938
+msgid "Page not found."
msgstr ""
#: lib/sandboxform.php:67
msgid "Sandbox"
msgstr ""
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Fjern blokeringen af denne bruger"
+
#. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
msgid "Search site"
msgstr ""
#. TRANS: Used as a field label for the field where one or more keywords
#. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
msgid "Keyword(s)"
msgstr ""
+#. TRANS: Button text for searching site.
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
@@ -5469,6 +8330,11 @@ msgstr ""
msgid "Find content of notices"
msgstr ""
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "grupper på %s"
+
#: lib/section.php:89
msgid "Untitled section"
msgstr ""
@@ -5481,6 +8347,11 @@ msgstr ""
msgid "Silence"
msgstr ""
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Slet denne bruger"
+
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
@@ -5491,6 +8362,16 @@ msgstr ""
msgid "People subscribed to %s"
msgstr ""
+#: lib/subgroupnav.php:99
+#, fuzzy, php-format
+msgid "Groups %s is a member of"
+msgstr "%1$s grupper som %2$s er medlem af."
+
+#: lib/subgroupnav.php:105
+#, fuzzy
+msgid "Invite"
+msgstr "Kun Inviterede"
+
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
@@ -5506,6 +8387,16 @@ msgstr ""
msgid "People Tagcloud as tagged"
msgstr ""
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Nej"
+
+#. TRANS: Server exception displayed if a theme name was invalid.
+#: lib/theme.php:74
+msgid "Invalid theme name."
+msgstr ""
+
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
msgstr ""
@@ -5514,92 +8405,155 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Mislykket ajourføring af Avatar."
+
#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
#: lib/themeuploader.php:166
#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
msgid "Theme contains unsafe file extension names; may be unsafe."
msgstr ""
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
+#: lib/themeuploader.php:260
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Fejl ved opdatering af fjernbetjeningsprofil."
+
#: lib/topposterssection.php:74
msgid "Top posters"
msgstr ""
+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr ""
+
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Fjern blokeringen af denne bruger"
+
#: lib/unsilenceform.php:67
msgid "Unsilence"
msgstr ""
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Fjern blokeringen af denne bruger"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Fjern blokeringen af denne bruger"
+
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
msgstr ""
-#: lib/userprofile.php:234 lib/userprofile.php:248
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:119
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Avatar"
+
+#: lib/userprofile.php:236 lib/userprofile.php:250
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:237
+#: lib/userprofile.php:239
msgid "User deletion in progress..."
msgstr ""
-#: lib/userprofile.php:264
+#: lib/userprofile.php:265
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Email indstillinger"
+
+#: lib/userprofile.php:266
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:288
+#: lib/userprofile.php:289
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Direkte beskeder til %s"
+
+#: lib/userprofile.php:290
msgid "Message"
msgstr ""
-#: lib/userprofile.php:326
+#: lib/userprofile.php:331
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:366
+#: lib/userprofile.php:369
+#, fuzzy
+msgid "User role"
+msgstr "Brugeren har ingen profil."
+
+#: lib/userprofile.php:371
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:367
+#: lib/userprofile.php:372
msgctxt "role"
msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1129
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5607,12 +8561,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1136
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1140
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5620,12 +8574,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1143
+#: lib/util.php:1293
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1147
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5633,12 +8587,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1150
+#: lib/util.php:1300
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1154
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5646,25 +8600,62 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1157
+#: lib/util.php:1307
msgid "about a year ago"
msgstr ""
-#: lib/webcolor.php:123
+#: lib/webcolor.php:80
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Hjemmesiden er ikke en gyldig URL adresse."
+
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
-#: scripts/restoreuser.php:82
+#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
+#: lib/xmppmanager.php:287
#, php-format
-msgid "Backup file for user %s (%s)\n"
+msgid "Unknown user. Go to %s to add your address to your account"
msgstr ""
-#: scripts/restoreuser.php:88
-msgid "No user specified; using backup user.\n"
+#. TRANS: Response to XMPP source when it sent too long a message.
+#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
+#: lib/xmppmanager.php:406
+#, php-format
+msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Exception.
+#: lib/xrd.php:64
+msgid "Invalid XML."
msgstr ""
-#: scripts/restoreuser.php:94
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
#, php-format
-msgid "%d entries in backup.\n"
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
+msgid "No user specified; using backup user."
msgstr ""
+
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 804da789a..07b8d42a6 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:05+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:53+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -549,24 +549,13 @@ msgstr "Konnte öffentlichen Stream nicht abrufen."
msgid "Could not find target user."
msgstr "Konnte keine Statusmeldungen finden."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
-"Leerzeichen sind nicht erlaubt."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -574,9 +563,9 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ungültiger Benutzername."
@@ -585,10 +574,10 @@ msgstr "Ungültiger Benutzername."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr ""
"Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
@@ -597,9 +586,9 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -611,9 +600,9 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -624,9 +613,9 @@ msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -636,8 +625,8 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -646,7 +635,7 @@ msgstr[1] "Zu viele Pseudonyme! Maximal %d sind erlaubt."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ungültiges Alias: „%s“"
@@ -655,8 +644,8 @@ msgstr "Ungültiges Alias: „%s“"
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
@@ -664,8 +653,8 @@ msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen au
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
@@ -860,7 +849,7 @@ msgstr "Profil"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -870,7 +859,7 @@ msgstr "Benutzername"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passwort"
@@ -1949,24 +1938,24 @@ msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ungültiges Stichwort: „%s“"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Konnte Gruppe nicht aktualisieren."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Konnte keinen Favoriten erstellen."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Einstellungen gespeichert."
@@ -2116,7 +2105,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
@@ -3116,11 +3105,11 @@ msgstr "Anmelden"
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Anmeldedaten merken"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
@@ -3525,7 +3514,7 @@ msgid "6 or more characters"
msgstr "6 oder mehr Zeichen"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bestätigen"
@@ -3537,11 +3526,11 @@ msgstr "Gleiches Passwort wie zuvor"
msgid "Change"
msgstr "Ändern"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Passwörter stimmen nicht überein."
@@ -3891,7 +3880,7 @@ msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3899,7 +3888,7 @@ msgstr "Bürgerlicher Name"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -3914,7 +3903,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3922,19 +3911,19 @@ msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Beschreibe dich selbst und deine Interessen"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografie"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3942,7 +3931,7 @@ msgid "Location"
msgstr "Aufenthaltsort"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
@@ -3997,7 +3986,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4286,7 +4275,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Fehler bei den Benutzereinstellungen."
@@ -4294,7 +4283,7 @@ msgstr "Fehler bei den Benutzereinstellungen."
msgid "New password successfully saved. You are now logged in."
msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
@@ -4306,7 +4295,7 @@ msgstr "Entschuldigung, ungültiger Einladungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -4314,20 +4303,20 @@ msgstr "Registrieren"
msgid "Registration not allowed."
msgstr "Registrierung nicht erlaubt."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Diese E-Mail-Adresse existiert bereits."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4335,65 +4324,65 @@ msgstr ""
"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 oder mehr Buchstaben. Pflicht."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-Mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Wird nur für Updates, wichtige Mitteilungen und zur "
"Passwortwiederherstellung verwendet"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
"Website"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Mir ist bewusst, dass Inhalte und Daten von %1$s privat und vertraulich sind."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Meine Texte und Dateien verbleiben unter meinem eigenen Urheberrecht."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Alle Rechte vorbehalten."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4402,7 +4391,7 @@ msgstr ""
"Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4435,7 +4424,7 @@ msgstr ""
"\n"
"Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6275,18 +6264,18 @@ msgstr "%1$s folgt nun %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Herzlich willkommen bei %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -6895,7 +6884,7 @@ msgstr "Abbrechen"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "von "
+msgstr " von "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7360,24 +7349,24 @@ msgstr ""
"tracking - noch nicht implementiert\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Keine Konfigurationsdatei gefunden."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Bitte die Installation erneut starten, um das Problem zu beheben."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Zur Installation gehen."
@@ -8218,6 +8207,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Senden"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+"Leerzeichen sind nicht erlaubt."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Nachricht senden"
@@ -8454,7 +8463,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Seite nicht gefunden."
@@ -8707,17 +8716,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8725,12 +8734,12 @@ msgstr[0] "vor ca. einer Minute"
msgstr[1] "vor ca. %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8738,12 +8747,12 @@ msgstr[0] "vor ca. einer Stunde"
msgstr[1] "vor ca. %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8751,12 +8760,12 @@ msgstr[0] "vor ca. einem Tag"
msgstr[1] "vor ca. %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8764,7 +8773,7 @@ msgstr[0] "vor ca. einem Monat"
msgstr[1] "vor ca. %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "vor ca. einem Jahr"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 4d0cbe222..e8a5df677 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:06+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:54+0000\n"
"Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -536,22 +536,13 @@ msgstr "Could not determine source user."
msgid "Could not find target user."
msgstr "Could not find target user."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Nickname already in use. Try another one."
@@ -559,9 +550,9 @@ msgstr "Nickname already in use. Try another one."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Not a valid nickname."
@@ -570,10 +561,10 @@ msgstr "Not a valid nickname."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Homepage is not a valid URL."
@@ -581,9 +572,9 @@ msgstr "Homepage is not a valid URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Full name is too long (max 255 chars)."
@@ -596,9 +587,9 @@ msgstr "Full name is too long (max 255 chars)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -609,9 +600,9 @@ msgstr[1] "Description is too long (max %d chars)"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Location is too long (max 255 chars)."
@@ -622,8 +613,8 @@ msgstr "Location is too long (max 255 chars)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -632,7 +623,7 @@ msgstr[1] "Too many aliases! Maximum %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Invalid alias: \"%s\"."
@@ -641,8 +632,8 @@ msgstr "Invalid alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" already in use. Try another one."
@@ -650,8 +641,8 @@ msgstr "Alias \"%s\" already in use. Try another one."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias can't be the same as nickname."
@@ -849,7 +840,7 @@ msgstr "Account"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -859,7 +850,7 @@ msgstr "Nickname"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
@@ -1935,24 +1926,24 @@ msgstr "Use this form to edit the group."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Invalid alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Could not update group."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Could not create aliases."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Options saved."
@@ -2098,7 +2089,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
@@ -3085,11 +3076,11 @@ msgstr "Login"
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Remember me"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Automatically login in the future; not for shared computers!"
@@ -3488,7 +3479,7 @@ msgid "6 or more characters"
msgstr "6 or more characters"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirm"
@@ -3500,11 +3491,11 @@ msgstr "Same as password above"
msgid "Change"
msgstr "Change"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Password must be 6 or more characters."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Passwords don't match."
@@ -3860,7 +3851,7 @@ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3868,7 +3859,7 @@ msgstr "Full name"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -3882,7 +3873,7 @@ msgstr "URL of your homepage, blog, or profile on another site"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3890,19 +3881,19 @@ msgstr[0] "Describe yourself and your interests in %d chars"
msgstr[1] "Describe yourself and your interests in %d chars"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Describe yourself and your interests"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3910,7 +3901,7 @@ msgid "Location"
msgstr "Location"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Where you are, like \"City, State (or Region), Country\""
@@ -3963,7 +3954,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4250,7 +4241,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Error setting user."
@@ -4258,7 +4249,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Sorry, only invited people can register."
@@ -4270,7 +4261,7 @@ msgstr "Sorry, invalid invitation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -4278,77 +4269,77 @@ msgstr "Register"
msgid "Registration not allowed."
msgstr "Registration not allowed."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "E-mail address already exists."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Invalid username or password."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 or more characters. Required."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Same as password above. Required."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Used only for updates, announcements, and password recovery"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL of your homepage, blog, or profile on another site"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4357,7 +4348,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4390,7 +4381,7 @@ msgstr ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6185,18 +6176,18 @@ msgstr "%1$s is now following %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welcome to %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7257,26 +7248,26 @@ msgstr ""
"tracking - not yet implemented.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "No configuration file found. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Invitation(s) sent to the following people:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Go to the installer."
@@ -8025,6 +8016,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Send"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Send a notice"
@@ -8259,7 +8268,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoke the \"%s\" role from this user"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API method not found."
@@ -8508,17 +8517,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8526,12 +8535,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8539,12 +8548,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8552,12 +8561,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8565,7 +8574,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index c534994c5..b9d28445a 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:07+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:55+0000\n"
"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: eo\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -539,23 +539,13 @@ msgstr " Malsukcesis certigi fontan uzanton."
msgid "Could not find target user."
msgstr "Malsukcesis trovi celan uzanton."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -563,9 +553,9 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ne valida kromnomo."
@@ -574,10 +564,10 @@ msgstr "Ne valida kromnomo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Ĉefpaĝo ne estas valida URL."
@@ -585,9 +575,9 @@ msgstr "Ĉefpaĝo ne estas valida URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
@@ -600,9 +590,9 @@ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -613,9 +603,9 @@ msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
@@ -626,8 +616,8 @@ msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -636,7 +626,7 @@ msgstr[1] "Tro da alinomoj! Maksimume %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "La alinomo estas nevalida: \"%*s\"."
@@ -645,8 +635,8 @@ msgstr "La alinomo estas nevalida: \"%*s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
@@ -654,8 +644,8 @@ msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "La alinomo devas ne esti sama al la kromnomo."
@@ -852,7 +842,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -862,7 +852,7 @@ msgstr "Kromnomo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Pasvorto"
@@ -1945,24 +1935,24 @@ msgstr "Uzas ĉi tiun formularon por redakti la grupon."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Nevalida alinomo: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Malsukcesis ĝisdatigi grupon."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Malsukcesis krei alinomon."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Elektoj konserviĝis."
@@ -2108,7 +2098,7 @@ msgid "Cannot normalize that email address"
msgstr "Malsukcesis normigi tiun retpoŝtadreson"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Retpoŝta adreso ne valida"
@@ -3088,11 +3078,11 @@ msgstr "Ensaluti"
msgid "Login to site"
msgstr "Ensaluti al la retejo"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Memoru min"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
@@ -3490,7 +3480,7 @@ msgid "6 or more characters"
msgstr "6 aŭ pli da literoj"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Konfirmi"
@@ -3502,11 +3492,11 @@ msgstr "Same kiel pasvorto supra"
msgid "Change"
msgstr "Ŝanĝi"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "La pasvortoj diferencas."
@@ -3855,7 +3845,7 @@ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3863,7 +3853,7 @@ msgstr "Plena nomo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hejmpaĝo"
@@ -3877,7 +3867,7 @@ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3885,19 +3875,19 @@ msgstr[0] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
msgstr[1] "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3905,7 +3895,7 @@ msgid "Location"
msgstr "Loko"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
@@ -3958,7 +3948,7 @@ msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4242,7 +4232,7 @@ msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
msgid "Password and confirmation do not match."
msgstr "Pasvorto kaj komfirmo ne kongruas."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Eraris agordi uzanton."
@@ -4250,7 +4240,7 @@ msgstr "Eraris agordi uzanton."
msgid "New password successfully saved. You are now logged in."
msgstr "Nova pasvorto sukcese konserviĝas. Vi nun estas ensalutinta."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Pardonon, nur invito rajtas registri."
@@ -4262,7 +4252,7 @@ msgstr "Pardonon, nevalida invitkodo."
msgid "Registration successful"
msgstr "Registriĝo sukcesa"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registri"
@@ -4270,19 +4260,19 @@ msgstr "Registri"
msgid "Registration not allowed."
msgstr "Registriĝo ne permesita."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Vi ne povas registriĝi, se vi ne konsentas kun la permesilo."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Retpoŝta adreso jam ekzistas."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nevalida uzantnomo aŭ pasvorto."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4290,61 +4280,61 @@ msgstr ""
"Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afiŝi avizon "
"kaj komuniki kun amikoj kaj kolegoj. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 aŭ pli da literoj. Bezonate."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Same kiel supra pasvorto. Bezonate."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Retpoŝto"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Pli longa nomo, prefere via \"vera\" nomo."
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Mia teksto kaj dosiero estas aŭtorrajtigita de %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Mia teksto kaj dosiero restu en mia propra aŭtorrajto."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Ĉiuj rajtoj rezervitaj."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4353,7 +4343,7 @@ msgstr ""
"Mia teksto kaj dosiero estas atingebla per %s krom jene: pasvorto, "
"retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4385,7 +4375,7 @@ msgstr ""
"\n"
"Dankon pro registri kaj ni esperas al vi ĝuo de uzi ĉi servon."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6187,18 +6177,18 @@ msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bonvenon al %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Neniu difinata uzanto por sol-uzanta reĝimo."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -6806,7 +6796,7 @@ msgstr "Nuligi"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "De "
+msgstr " De "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7274,26 +7264,26 @@ msgstr ""
"tracking -ankoraŭ ne realigita.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ne troviĝas agorda dosiero. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Mi serĉis agordan dosieron je jenaj lokoj: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Al la instalilo."
@@ -8137,6 +8127,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Sendi"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Sendi avizon"
@@ -8374,7 +8383,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoki rolon %s de la uzanto"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Metodo de API ne troviĝas."
@@ -8627,17 +8636,17 @@ msgid "Moderator"
msgstr "Moderanto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "antaŭ kelkaj sekundoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "antaŭ ĉirkaŭ unu minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8645,12 +8654,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu minuto"
msgstr[1] "antaŭ ĉirkaŭ %d minutoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "antaŭ ĉirkaŭ unu horo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8658,12 +8667,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu horo"
msgstr[1] "antaŭ ĉirkaŭ %d horoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "antaŭ ĉirkaŭ unu tago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8671,12 +8680,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu tago"
msgstr[1] "antaŭ ĉirkaŭ %d tagoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "Antaŭ ĉrikaŭ unu monato"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8684,7 +8693,7 @@ msgstr[0] "antaŭ ĉirkaŭ unu monato"
msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "antaŭ ĉirkaŭ unu jaro"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 7599beb16..ca3ed793f 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:08+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:56+0000\n"
"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -540,24 +540,13 @@ msgstr "No se pudo determinar el usuario fuente."
msgid "Could not find target user."
msgstr "No se pudo encontrar ningún usuario de destino."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"espacios."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "El usuario ya existe. Prueba con otro."
@@ -565,9 +554,9 @@ msgstr "El usuario ya existe. Prueba con otro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Usuario inválido"
@@ -576,10 +565,10 @@ msgstr "Usuario inválido"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "La página de inicio no es un URL válido."
@@ -587,9 +576,9 @@ msgstr "La página de inicio no es un URL válido."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -602,9 +591,9 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -615,9 +604,9 @@ msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -628,8 +617,8 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -638,7 +627,7 @@ msgstr[1] "¡Muchos seudónimos! El máximo es %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias inválido: \"%s\"."
@@ -647,8 +636,8 @@ msgstr "Alias inválido: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
@@ -656,8 +645,8 @@ msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "El alias no puede ser el mismo que el usuario."
@@ -858,7 +847,7 @@ msgstr "Cuenta"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -868,7 +857,7 @@ msgstr "Usuario"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contraseña"
@@ -1956,24 +1945,24 @@ msgstr "Usa este formulario para editar el grupo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias inválido: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "No se pudo actualizar el grupo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "No fue posible crear alias."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Se guardó Opciones."
@@ -2122,7 +2111,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
@@ -3118,11 +3107,11 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Recordarme"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
@@ -3527,7 +3516,7 @@ msgid "6 or more characters"
msgstr "6 o más caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmar"
@@ -3539,11 +3528,11 @@ msgstr "Igual a la contraseña de arriba"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "La contraseña debe tener 6 o más caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Las contraseñas no coinciden"
@@ -3912,7 +3901,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3920,7 +3909,7 @@ msgstr "Nombre completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
@@ -3934,7 +3923,7 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3942,19 +3931,19 @@ msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Descríbete y cuéntanos acerca de tus intereses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografía"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3962,7 +3951,7 @@ msgid "Location"
msgstr "Ubicación"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
@@ -4017,7 +4006,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4313,7 +4302,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Error al configurar el usuario."
@@ -4321,7 +4310,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
@@ -4333,7 +4322,7 @@ msgstr "El código de invitación no es válido."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -4341,19 +4330,19 @@ msgstr "Registrarse"
msgid "Registration not allowed."
msgstr "Registro de usuario no permitido."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "La dirección de correo electrónico ya existe."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Usuario o contraseña inválidos."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4361,64 +4350,64 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 o más caracters. Requerido."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Entiendo que el contenido y los datos de %1$s son privados y confidenciales."
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Todos los derechos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4428,7 +4417,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4461,7 +4450,7 @@ msgstr ""
"\n"
"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6303,18 +6292,18 @@ msgstr "%1$s ahora está escuchando tus avisos en %2$s"
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenido a %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Ningún usuario sólo definido para modo monousuario."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7398,26 +7387,26 @@ msgstr ""
"tracking - aún sin implementar.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ningún archivo de configuración encontrado. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "He buscado archivos de configuración en los siguientes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Quizá desees ejecutar el instalador para solucionar este problema."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -8269,6 +8258,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"El usuario debe tener solamente letras minúsculas y números y no puede tener "
+"espacios."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Enviar un mensaje"
@@ -8505,7 +8514,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar el rol \"%s\" de este usuario"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Método de API no encontrado."
@@ -8760,17 +8769,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8778,12 +8787,12 @@ msgstr[0] "hace aproximadamente un minuto"
msgstr[1] "hace aproximadamente %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8791,12 +8800,12 @@ msgstr[0] "hace aproximadamente una hora"
msgstr[1] "hace aproximadamente %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8804,12 +8813,12 @@ msgstr[0] "hace aproximadamente un día"
msgstr[1] "hace aproximadamente %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8817,7 +8826,7 @@ msgstr[0] "hace aproximadamente un mes"
msgstr[1] "hace aproximadamente %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 68276ce26..2ada3e464 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:56:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:17:57+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
"MIME-Version: 1.0\n"
@@ -25,9 +25,9 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -533,22 +533,13 @@ msgstr "نمی‌توان کاربر منبع را تعیین کرد."
msgid "Could not find target user."
msgstr "نمی‌توان کاربر هدف را پیدا کرد."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -556,9 +547,9 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "لقب نا معتبر."
@@ -567,10 +558,10 @@ msgstr "لقب نا معتبر."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -578,9 +569,9 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
@@ -593,9 +584,9 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -605,9 +596,9 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
@@ -618,8 +609,8 @@ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نوی
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -627,7 +618,7 @@ msgstr[0] "نام‌های مستعار بسیار زیاد هستند! حداک
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "نام مستعار نامعتبر است: «%s»."
@@ -636,8 +627,8 @@ msgstr "نام مستعار نامعتبر است: «%s»."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. یکی دیگر را امتحان کنید."
@@ -645,8 +636,8 @@ msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. ی
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
@@ -848,7 +839,7 @@ msgstr "حساب کاربری"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -858,7 +849,7 @@ msgstr "نام کاربری"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "گذرواژه"
@@ -1949,24 +1940,24 @@ msgstr "از این روش برای ویرایش گروه استفاده کنی
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "نام‌مستعار غیر مجاز: «%s»"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "نمی‌توان نام‌های مستعار را ساخت."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "گزینه‌ها ذخیره شدند."
@@ -2115,7 +2106,7 @@ msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "یک نشانی پست الکترونیکی معتبر نیست."
@@ -3095,11 +3086,11 @@ msgstr "ورود"
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "مرا به یاد بسپار"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
@@ -3499,7 +3490,7 @@ msgid "6 or more characters"
msgstr "۶ نویسه یا بیش‌تر"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "تایید"
@@ -3511,11 +3502,11 @@ msgstr "مانند گذرواژهٔ بالا"
msgid "Change"
msgstr "تغییر"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "گذرواژه‌ها مطابقت ندارند."
@@ -3881,7 +3872,7 @@ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذ
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3889,7 +3880,7 @@ msgstr "نام‌کامل"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "صفحهٔ خانگی"
@@ -3903,26 +3894,26 @@ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نم
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "خودتان و علاقه‌مندی‌هایتان را در %d نویسه توصیف کنید"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "خودتان و علاقه‌مندی‌هایتان را توصیف کنید"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "شرح‌حال"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3930,7 +3921,7 @@ msgid "Location"
msgstr "موقعیت"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
@@ -3983,7 +3974,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4269,7 +4260,7 @@ msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
msgid "Password and confirmation do not match."
msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "هنگام گذاشتن کاربر خطا روی داد."
@@ -4277,7 +4268,7 @@ msgstr "هنگام گذاشتن کاربر خطا روی داد."
msgid "New password successfully saved. You are now logged in."
msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شده‌اید."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
@@ -4289,7 +4280,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
msgid "Registration successful"
msgstr "ثبت نام با موفقیت انجام شد."
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
@@ -4297,19 +4288,19 @@ msgstr "ثبت نام"
msgid "Registration not allowed."
msgstr "اجازهٔ ثبت‌نام داده نشده است."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "نام کاربری یا گذرواژه نا معتبر است."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4317,59 +4308,59 @@ msgstr ""
"با این فرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بفرستید و "
"به دوستان و همکارانتان بپیوندید. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "۶ نویسه یا بیش‌تر مورد نیاز است."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "پست الکترونیکی"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "من متوجه هستم که محتوا و داده‌های %1$s خصوصی و محرمانه هستند."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "متن و پرونده‌های من دارای حق تکثیر %1$s هستند."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "تمام حقوق محفوظ است."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4378,7 +4369,7 @@ msgstr ""
"نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
"نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4412,7 +4403,7 @@ msgstr ""
"از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
"سرویس لذت ببرید."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6235,18 +6226,18 @@ msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s، به %1$s خوش آمدید!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7319,26 +7310,26 @@ msgstr ""
"tracking - هنوز پیاده نشده است.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "بدون کد تصدیق."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "من به دنبال پرونده‌های پیکربندی در مکان‌های زیر بودم: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "برو به نصاب."
@@ -8172,6 +8163,23 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "فرستادن"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "فرستادن یک پیام"
@@ -8410,7 +8418,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر به گروه مسدود شود"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "رابط مورد نظر پیدا نشد."
@@ -8663,60 +8671,60 @@ msgid "Moderator"
msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 7ba94f9e9..5c0622c05 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:20+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:00+0000\n"
"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -541,24 +541,13 @@ msgstr "Ei voitu päivittää käyttäjää."
msgid "Could not find target user."
msgstr "Ei voitu päivittää käyttäjää."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"välilyöntiä."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -566,9 +555,9 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Tuo ei ole kelvollinen tunnus."
@@ -577,10 +566,10 @@ msgstr "Tuo ei ole kelvollinen tunnus."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -588,9 +577,9 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
@@ -603,9 +592,9 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -616,9 +605,9 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
@@ -629,8 +618,8 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -639,7 +628,7 @@ msgstr[1] "Liikaa aliaksia. Maksimimäärä on %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Virheellinen alias: \"%s\""
@@ -648,8 +637,8 @@ msgstr "Virheellinen alias: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
@@ -657,8 +646,8 @@ msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias ei voi olla sama kuin ryhmätunnus."
@@ -855,7 +844,7 @@ msgstr "Käyttäjätili"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -865,7 +854,7 @@ msgstr "Tunnus"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Salasana"
@@ -1967,24 +1956,24 @@ msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Virheellinen alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Ei voitu päivittää ryhmää."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Ei voitu lisätä aliasta."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Asetukset tallennettu."
@@ -2137,7 +2126,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -3125,11 +3114,11 @@ msgstr "Kirjaudu sisään"
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Muista minut"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
@@ -3542,7 +3531,7 @@ msgid "6 or more characters"
msgstr "6 tai useampia merkkejä"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Vahvista"
@@ -3554,11 +3543,11 @@ msgstr "Sama kuin ylläoleva salasana"
msgid "Change"
msgstr "Vaihda"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Salasanat eivät täsmää."
@@ -3933,7 +3922,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3941,7 +3930,7 @@ msgstr "Koko nimi"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
@@ -3955,7 +3944,7 @@ msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3963,19 +3952,19 @@ msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Tietoja"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3983,7 +3972,7 @@ msgid "Location"
msgstr "Kotipaikka"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
#, fuzzy
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -4039,7 +4028,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4324,7 +4313,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
@@ -4333,7 +4322,7 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
@@ -4345,7 +4334,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -4353,81 +4342,81 @@ msgstr "Rekisteröidy"
msgid "Registration not allowed."
msgstr "Rekisteröityminen ei ole sallittu."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Sähköpostiosoite on jo käytössä."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Käyttäjätunnus tai salasana ei kelpaa."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 tai useampia merkkejä. Pakollinen."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Sama kuin ylläoleva salasana. Pakollinen."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Sähköposti"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Pitempi nimi, mieluiten oikea nimesi"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4436,7 +4425,7 @@ msgstr ""
"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
"puhelinnumero."
-#: actions/register.php:590
+#: actions/register.php:589
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4469,7 +4458,7 @@ msgstr ""
"\n"
"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6303,18 +6292,18 @@ msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7387,26 +7376,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Varmistuskoodia ei ole annettu."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Kutsu(t) lähetettiin seuraaville henkilöille:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -8168,6 +8157,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Lähetä"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
+"välilyöntiä."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Lähetä päivitys"
@@ -8413,7 +8422,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API-metodia ei löytynyt."
@@ -8675,17 +8684,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8693,12 +8702,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8706,12 +8715,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8719,12 +8728,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8732,7 +8741,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 0058afd28..8f9fdd5bf 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
# Author: Isoph
# Author: Jean-Frédéric
# Author: Julien C
+# Author: Lockal
# Author: McDutchie
# Author: Patcito
# Author: Peter17
@@ -20,17 +21,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:22+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:01+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -548,24 +549,13 @@ msgstr "Impossible de déterminer l’utilisateur source."
msgid "Could not find target user."
msgstr "Impossible de trouver l’utilisateur cible."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"chiffres, sans espaces."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -573,9 +563,9 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Pseudo invalide."
@@ -584,10 +574,10 @@ msgstr "Pseudo invalide."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -595,9 +585,9 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
@@ -609,9 +599,9 @@ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -622,9 +612,9 @@ msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -634,17 +624,17 @@ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Trop d’alias ! Un maximum de %d est autorisé."
+msgstr[1] "Trop d’alias ! Un maximum de %d est autorisé."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias invalide : « %s »."
@@ -653,8 +643,8 @@ msgstr "Alias invalide : « %s »."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
@@ -662,8 +652,8 @@ msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "L’alias ne peut pas être le même que le pseudo."
@@ -864,7 +854,7 @@ msgstr "Compte"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -874,7 +864,7 @@ msgstr "Pseudo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Mot de passe"
@@ -1953,24 +1943,24 @@ msgstr "Remplissez ce formulaire pour modifier les options du groupe."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias invalide : « %s »"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Impossible de mettre à jour le groupe."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Impossible de créer les alias."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Vos options ont été enregistrées."
@@ -2118,7 +2108,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
@@ -3123,11 +3113,11 @@ msgstr "Ouvrir une session"
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
@@ -3536,7 +3526,7 @@ msgid "6 or more characters"
msgstr "6 caractères ou plus"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmer"
@@ -3548,11 +3538,11 @@ msgstr "Identique au mot de passe ci-dessus"
msgid "Change"
msgstr "Modifier"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Les mots de passe ne correspondent pas."
@@ -3902,7 +3892,7 @@ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3910,7 +3900,7 @@ msgstr "Nom complet"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
@@ -3924,7 +3914,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3932,19 +3922,19 @@ msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Décrivez vous et vos interêts"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3952,7 +3942,7 @@ msgid "Location"
msgstr "Emplacement"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
@@ -4007,7 +3997,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4297,7 +4287,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Erreur lors de la configuration de l’utilisateur."
@@ -4306,7 +4296,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
@@ -4318,7 +4308,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -4326,19 +4316,19 @@ msgstr "Créer un compte"
msgid "Registration not allowed."
msgstr "Inscription non autorisée."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Cette adresse courriel est déjà utilisée."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Identifiant ou mot de passe incorrect."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4346,41 +4336,41 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 caractères ou plus. Requis."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Courriel"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nom plus long, votre \"vrai\" nom de préférence"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"Adresse URL de votre page personnelle, blogue ou profil sur un autre site"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4388,23 +4378,23 @@ msgstr ""
"Je comprends que le contenu et les données de %1$s sont privés et "
"confidentiels."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Tous droits réservés."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4414,7 +4404,7 @@ msgstr ""
"données personnelles : mot de passe, adresse électronique, adresse de "
"messagerie instantanée, numéro de téléphone."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4448,7 +4438,7 @@ msgstr ""
"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
"service."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6300,18 +6290,18 @@ msgstr "%1$s suit à présent %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenue à %1$s, @%2$s !"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "Code en mode mono-utilisateur appelé quand ce n’est pas autorisé."
@@ -6957,6 +6947,7 @@ msgid "Revoke"
msgstr "Révoquer"
#: lib/atom10feed.php:112
+#, fuzzy
msgid "author element must contain a name element."
msgstr "l’élément « auteur » doit contenir un élément « nom »."
@@ -7401,25 +7392,25 @@ msgstr ""
"tracking - pas encore implémenté.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Aucun fichier de configuration n’a été trouvé."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
"Les fichiers de configuration ont été cherchés aux emplacements suivants :"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -8268,6 +8259,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Envoyer"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Les pseudos ne peuvent contenir que des caractères minuscules et des "
+"chiffres, sans espaces."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Envoyer un avis"
@@ -8504,7 +8515,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Page non trouvée."
@@ -8760,64 +8771,64 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] "une minute"
-msgstr[1] "%d minutes"
+msgstr[0] "il y a environ une minute"
+msgstr[1] "il y a environ %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "une heure"
-msgstr[1] "%d heures"
+msgstr[0] "il y a environ une heure"
+msgstr[1] "il y a environ %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "un jour"
-msgstr[1] "%d jours"
+msgstr[0] "il y a environ un jour"
+msgstr[1] "il y a environ %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "un"
-msgstr[1] "%d"
+msgstr[0] "il y a environ un mois"
+msgstr[1] "il y a environ %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 44d540b4c..6033f0d5b 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:23+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:02+0000\n"
"Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
"2 : ( (n < 11) ? 3 : 4 ) ) );\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -549,22 +549,13 @@ msgstr "Non se puido actualizar o usuario."
msgid "Could not find target user."
msgstr "Non se puido actualizar o usuario."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
@@ -572,9 +563,9 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Non é un alcume válido."
@@ -583,10 +574,10 @@ msgstr "Non é un alcume válido."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "A páxina persoal semella que non é unha URL válida."
@@ -594,9 +585,9 @@ msgstr "A páxina persoal semella que non é unha URL válida."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "O nome completo é demasiado longo (max 255 car)."
@@ -609,9 +600,9 @@ msgstr "O nome completo é demasiado longo (max 255 car)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -625,9 +616,9 @@ msgstr[4] "O teu Bio é demasiado longo (max %d car.)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "A localización é demasiado longa (max 255 car.)."
@@ -638,8 +629,8 @@ msgstr "A localización é demasiado longa (max 255 car.)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -651,7 +642,7 @@ msgstr[4] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Etiqueta inválida: '%s'"
@@ -660,8 +651,8 @@ msgstr "Etiqueta inválida: '%s'"
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
@@ -669,8 +660,8 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -865,7 +856,7 @@ msgstr "Sobre"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -875,7 +866,7 @@ msgstr "Alcume"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasinal"
@@ -2000,26 +1991,26 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Etiqueta inválida: '%s'"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
#, fuzzy
msgid "Could not update group."
msgstr "Non se puido actualizar o usuario."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
#, fuzzy
msgid "Could not create aliases."
msgstr "Non se puido crear o favorito."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
#, fuzzy
msgid "Options saved."
msgstr "Configuracións gardadas."
@@ -2172,7 +2163,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
@@ -3184,11 +3175,11 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr ""
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Lembrarme"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
@@ -3602,7 +3593,7 @@ msgid "6 or more characters"
msgstr "6 ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmar"
@@ -3614,11 +3605,11 @@ msgstr "Igual que a contrasinal de enriba"
msgid "Change"
msgstr "Modificado"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "As contrasinais non coinciden"
@@ -3984,7 +3975,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3992,7 +3983,7 @@ msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
@@ -4006,7 +3997,7 @@ msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -4017,20 +4008,20 @@ msgstr[3] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
msgstr[4] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -4038,7 +4029,7 @@ msgid "Location"
msgstr "Localización"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
@@ -4093,7 +4084,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4387,7 +4378,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Acounteceu un erro configurando o usuario."
@@ -4395,7 +4386,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Desculpa, só se pode rexistrar a xente con invitación."
@@ -4408,7 +4399,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -4416,19 +4407,19 @@ msgstr "Rexistrar"
msgid "Registration not allowed."
msgstr "Non se permite o rexistro neste intre."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "O enderezo de correo xa existe."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Usuario ou contrasinal inválidos."
-#: actions/register.php:352
+#: actions/register.php:351
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -4438,62 +4429,62 @@ msgstr ""
"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
-#: actions/register.php:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Requerido."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "A mesma contrasinal que arriba. Requerido."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correo Electrónico"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Empregado só para actualizacións, novidades, e recuperación de contrasinais"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome máis longo, preferiblemente o teu nome \"real\""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4502,7 +4493,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:590
+#: actions/register.php:589
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4534,7 +4525,7 @@ msgstr ""
"\n"
"Grazas por rexistrarte e esperamos que laretexes moito."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6383,18 +6374,18 @@ msgstr "%1$s está a escoitar os teus chíos %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7532,26 +7523,26 @@ msgstr ""
"tracking - non implementado por agora.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Sen código de confirmación."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Invitación(s) enviada(s) á seguinte xente:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr ""
@@ -8370,6 +8361,27 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Novo chío"
@@ -8622,7 +8634,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Método da API non atopado"
@@ -8894,17 +8906,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8915,12 +8927,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8931,12 +8943,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8947,12 +8959,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8963,7 +8975,7 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 d49dd9caa..42afe39ec 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:27+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:04+0000\n"
"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -538,24 +538,13 @@ msgstr "Non se puido determinar o usuario de orixe."
msgid "Could not find target user."
msgstr "Non se puido atopar o usuario de destino."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"en branco."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -563,9 +552,9 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "O formato do alcume non é correcto."
@@ -574,10 +563,10 @@ msgstr "O formato do alcume non é correcto."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "O URL da páxina persoal non é correcto."
@@ -585,9 +574,9 @@ msgstr "O URL da páxina persoal non é correcto."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
@@ -600,9 +589,9 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -613,9 +602,9 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
@@ -626,8 +615,8 @@ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -636,7 +625,7 @@ msgstr[1] "Demasiados pseudónimos! O número máximo é %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Pseudónimo incorrecto: \"%s\"."
@@ -645,8 +634,8 @@ msgstr "Pseudónimo incorrecto: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
@@ -654,8 +643,8 @@ msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "O pseudónimo non pode coincidir co alcume."
@@ -855,7 +844,7 @@ msgstr "Conta"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -865,7 +854,7 @@ msgstr "Alcume"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasinal"
@@ -1950,24 +1939,24 @@ msgstr "Utilice este formulario para editar o grupo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Pseudónimo inválido: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Non se puido actualizar o grupo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Non se puideron crear os pseudónimos."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Gardáronse as preferencias."
@@ -2120,7 +2109,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
@@ -3115,11 +3104,11 @@ msgstr "Identificarse"
msgid "Login to site"
msgstr "Identificarse no sitio"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Lembrádeme"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
@@ -3525,7 +3514,7 @@ msgid "6 or more characters"
msgstr "Seis ou máis caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmar"
@@ -3537,11 +3526,11 @@ msgstr "Igual ao contrasinal anterior"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Os contrasinais non coinciden."
@@ -3905,7 +3894,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3913,7 +3902,7 @@ msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
@@ -3927,7 +3916,7 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3935,19 +3924,19 @@ msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Descríbase a vostede e mailos seus intereses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografía"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3955,7 +3944,7 @@ msgid "Location"
msgstr "Lugar"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
@@ -4010,7 +3999,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4305,7 +4294,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Houbo un erro ao configurar o usuario."
@@ -4313,7 +4302,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Só se pode rexistrar mediante invitación."
@@ -4325,7 +4314,7 @@ msgstr "O código da invitación é incorrecto."
msgid "Registration successful"
msgstr "Rexistrouse correctamente"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrarse"
@@ -4333,19 +4322,19 @@ msgstr "Rexistrarse"
msgid "Registration not allowed."
msgstr "Non se permite o rexistro."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "O enderezo de correo electrónico xa existe."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4353,65 +4342,65 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 ou máis caracteres. Obrigatorio."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correo electrónico"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome longo, preferiblemente o seu nome \"real\""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Entendo que o contido e os datos de %1$s son privados e confidenciais."
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Todos os dereitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4421,7 +4410,7 @@ msgstr ""
"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
"instantánea e números de teléfono."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4453,7 +4442,7 @@ msgstr ""
"\n"
"Grazas por rexistrarse. Esperamos que goce deste servizo."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6296,18 +6285,18 @@ msgstr "%1$s xa segue a %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvido a %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7393,26 +7382,26 @@ msgstr ""
"tracking - aínda non se integrou\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Non se atopou ningún ficheiro de configuración. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Pode que queira executar o instalador para arranxalo."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Ir ao instalador."
@@ -8263,6 +8252,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
+"en branco."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Enviar unha nota"
@@ -8499,7 +8508,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revogarlle o rol \"%s\" a este usuario"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Non se atopou o método da API."
@@ -8756,17 +8765,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8774,12 +8783,12 @@ msgstr[0] "hai un minuto"
msgstr[1] "hai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8787,12 +8796,12 @@ msgstr[0] "hai unha hora"
msgstr[1] "hai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8800,12 +8809,12 @@ msgstr[0] "hai un día"
msgstr[1] "hai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8813,7 +8822,7 @@ msgstr[0] "hai un mes"
msgstr[1] "hai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "hai como un ano"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 9cd502df0..bc5f656fd 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:28+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:06+0000\n"
"Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
"n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -527,23 +527,13 @@ msgstr "Žórłowy wužiwar njeda so postajić."
msgid "Could not find target user."
msgstr "Cilowy wužiwar njeda so namakać."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -551,9 +541,9 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Žane płaćiwe přimjeno."
@@ -562,10 +552,10 @@ msgstr "Žane płaćiwe přimjeno."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Startowa strona njeje płaćiwy URL."
@@ -573,9 +563,9 @@ msgstr "Startowa strona njeje płaćiwy URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
@@ -587,9 +577,9 @@ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -602,9 +592,9 @@ msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -614,8 +604,8 @@ msgstr "Městno je předołho (maks. 255 znamješkow)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -626,7 +616,7 @@ msgstr[3] "Přewjele aliasow! Maks. %d dowolenych."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Njepłaćiwy alias: \"%s\"."
@@ -635,8 +625,8 @@ msgstr "Njepłaćiwy alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
@@ -644,8 +634,8 @@ msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias njemóže samsny kaž přimjeno być."
@@ -834,7 +824,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -844,7 +834,7 @@ msgstr "Přimjeno"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hesło"
@@ -1900,24 +1890,24 @@ msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Njepłaćiwy alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Skupina njeje so dała aktualizować."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Aliasy njejsu so dali wutworić."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Opcije składowane."
@@ -2061,7 +2051,7 @@ msgid "Cannot normalize that email address"
msgstr "Tuta e-mejlowa adresa njehodźi so normalizować"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -2995,11 +2985,11 @@ msgstr "Přizjewić"
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Składować"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3388,7 +3378,7 @@ msgid "6 or more characters"
msgstr "6 abo wjace znamješkow"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Wobkrućić"
@@ -3400,11 +3390,11 @@ msgstr "Samsne hesło kaž horjeka"
msgid "Change"
msgstr "Změnić"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Hesle so njekryjetej."
@@ -3751,7 +3741,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3759,7 +3749,7 @@ msgstr "Dospołne mjeno"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
@@ -3772,7 +3762,7 @@ msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3782,19 +3772,19 @@ msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Wopisaj sebje a swoje zajimy"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografija"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3802,7 +3792,7 @@ msgid "Location"
msgstr "Městno"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
@@ -3853,7 +3843,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4126,7 +4116,7 @@ msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
msgid "Password and confirmation do not match."
msgstr "Hesło a jeho wobkrućenje so njekryjetej."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Zmylk při nastajenju wužiwarja."
@@ -4134,7 +4124,7 @@ msgstr "Zmylk při nastajenju wužiwarja."
msgid "New password successfully saved. You are now logged in."
msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować."
@@ -4146,7 +4136,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
@@ -4154,84 +4144,84 @@ msgstr "Registrować"
msgid "Registration not allowed."
msgstr "Registracija njedowolena."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "E-mejlowa adresa hižo eksistuje."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 abo wjace znamješkow. Trěbne."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mejl"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Wšě prawa wuměnjenjene."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4250,7 +4240,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5994,18 +5984,18 @@ msgstr ""
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj do %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7068,26 +7058,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Žana konfiguraciska dataja namakana. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Sym na slědowacych městnach za konfiguraciskimi datajemi pytał: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjedźił."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "K instalaciji"
@@ -7844,6 +7834,27 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Pósłać"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Zdźělenku pósłać"
@@ -8081,7 +8092,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API-metoda njenamakana."
@@ -8338,17 +8349,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8358,12 +8369,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8373,12 +8384,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8388,12 +8399,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8403,7 +8414,7 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 5d25b8247..e43c184ee 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:32+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:06+0000\n"
"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hu\n"
"X-Message-Group: #out-statusnet-core\n"
@@ -532,22 +532,13 @@ msgstr "Nem sikerült megállapítani a forrás felhasználót."
msgid "Could not find target user."
msgstr "A cél felhasználó nem található."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "A becenév már foglalt. Próbálj meg egy másikat."
@@ -555,9 +546,9 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Nem érvényes becenév."
@@ -566,10 +557,10 @@ msgstr "Nem érvényes becenév."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "A honlap érvénytelen URL-cím."
@@ -577,9 +568,9 @@ msgstr "A honlap érvénytelen URL-cím."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
@@ -592,9 +583,9 @@ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -605,9 +596,9 @@ msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
@@ -618,8 +609,8 @@ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -628,7 +619,7 @@ msgstr[1] "Túl sok álnév! Legfeljebb %d lehet."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Érvénytelen álnév: „%s”."
@@ -637,8 +628,8 @@ msgstr "Érvénytelen álnév: „%s”."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "A(z) „%s” álnév már használatban van. Próbálj meg egy másikat."
@@ -646,8 +637,8 @@ msgstr "A(z) „%s” álnév már használatban van. Próbálj meg egy másikat
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Az álnév nem egyezhet meg a becenévvel."
@@ -839,7 +830,7 @@ msgstr "Kontó"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -849,7 +840,7 @@ msgstr "Becenév"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Jelszó"
@@ -1925,24 +1916,24 @@ msgstr "Ezen űrlap segítségével szerkesztheted a csoportot."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Érvénytelen álnév: „%s”"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Nem sikerült a csoport frissítése."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Nem sikerült létrehozni az álneveket."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Beállítások elmentve."
@@ -2091,7 +2082,7 @@ msgid "Cannot normalize that email address"
msgstr "Nem sikerült normalizálni az e-mail címet"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Érvénytelen email cím."
@@ -3032,11 +3023,11 @@ msgstr "Bejelentkezés"
msgid "Login to site"
msgstr "Bejelentkezés az oldalra"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Emlékezz rám"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"A jövőben legyen automatikus a bejelentkezés; csak ha egyedül használod a "
@@ -3424,7 +3415,7 @@ msgid "6 or more characters"
msgstr "6 vagy több karakter"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Megerősítés"
@@ -3436,11 +3427,11 @@ msgstr "Ugyanaz mint a fenti jelszó"
msgid "Change"
msgstr "Változtassunk"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "A jelszónak legalább 6 karakterből kell állnia."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "A jelszavak nem egyeznek."
@@ -3806,7 +3797,7 @@ msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3814,7 +3805,7 @@ msgstr "Teljes név"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Honlap"
@@ -3830,7 +3821,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3838,19 +3829,19 @@ msgstr[0] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
msgstr[1] "Jellemezd önmagad és az érdeklődési köröd %d karakterben"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Jellemezd önmagad és az érdeklődési köröd"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Életrajz"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3858,7 +3849,7 @@ msgid "Location"
msgstr "Helyszín"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
@@ -3913,7 +3904,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4189,7 +4180,7 @@ msgstr "A jelszónak legalább 6 karakterből kell állnia."
msgid "Password and confirmation do not match."
msgstr "A jelszó és a megerősítése nem egyeznek meg."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Hiba a felhasználó beállításakor."
@@ -4197,7 +4188,7 @@ msgstr "Hiba a felhasználó beállításakor."
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Elnézést, de csak meghívóval lehet regisztrálni."
@@ -4209,7 +4200,7 @@ msgstr ""
msgid "Registration successful"
msgstr "A regisztráció sikeres"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Regisztráció"
@@ -4217,89 +4208,89 @@ msgstr "Regisztráció"
msgid "Registration not allowed."
msgstr "A regisztráció nem megengedett."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Nem tudsz regisztrálni ha nem fogadod el a licencet."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Az e-mail cím már létezik."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Érvénytelen felhasználónév vagy jelszó."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. Szükséges."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 vagy több karakter. Kötelező."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Csak frissítéskor, fontos közlemények esetén és jelszóproblémák orvoslására "
"használjuk"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
"A honlapodhoz, blogodhoz, vagy egy másik webhelyen lévő profilodhoz tartozó "
"URL"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4318,7 +4309,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6057,18 +6048,18 @@ msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7092,26 +7083,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Nem találtunk konfigurációs fájlt. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "A következő helyeken kerestem konfigurációs fájlokat: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "A telepítő futtatása kijavíthatja ezt."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Menj a telepítőhöz."
@@ -7916,6 +7907,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr ""
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Küldjünk egy hírt"
@@ -8150,7 +8159,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Az API-metódus nem található."
@@ -8399,17 +8408,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "pár másodperce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "körülbelül egy perce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8417,12 +8426,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "körülbelül egy órája"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8430,12 +8439,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "körülbelül egy napja"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8443,12 +8452,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "körülbelül egy hónapja"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8456,7 +8465,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "körülbelül egy éve"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 2e268aad2..f6f6e9978 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:07+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -534,22 +534,13 @@ msgstr "Non poteva determinar le usator de origine."
msgid "Could not find target user."
msgstr "Non poteva trovar le usator de destination."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -557,9 +548,9 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Non un pseudonymo valide."
@@ -568,10 +559,10 @@ msgstr "Non un pseudonymo valide."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Le pagina personal non es un URL valide."
@@ -579,9 +570,9 @@ msgstr "Le pagina personal non es un URL valide."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -593,9 +584,9 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -606,9 +597,9 @@ msgstr[1] "Description es troppo longe (maximo %d characteres)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -618,8 +609,8 @@ msgstr "Loco es troppo longe (maximo 255 characteres)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -628,7 +619,7 @@ msgstr[1] "Troppo de aliases! Maximo permittite: %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias invalide: \"%s\"."
@@ -637,8 +628,8 @@ msgstr "Alias invalide: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
@@ -646,8 +637,8 @@ msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Le alias non pote esser identic al pseudonymo."
@@ -843,7 +834,7 @@ msgstr "Conto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -853,7 +844,7 @@ msgstr "Pseudonymo"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasigno"
@@ -1930,24 +1921,24 @@ msgstr "Usa iste formulario pro modificar le gruppo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias invalide: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Non poteva actualisar gruppo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Non poteva crear aliases."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Optiones salveguardate."
@@ -2094,7 +2085,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
@@ -3086,11 +3077,11 @@ msgstr "Aperir session"
msgid "Login to site"
msgstr "Authenticar te a iste sito"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Memorar me"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Aperir session automaticamente in le futuro; non pro computatores usate in "
@@ -3494,7 +3485,7 @@ msgid "6 or more characters"
msgstr "6 o plus characteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmar"
@@ -3506,11 +3497,11 @@ msgstr "Identic al contrasigno hic supra"
msgid "Change"
msgstr "Cambiar"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Le contrasigno debe haber al minus 6 characteres."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Le contrasignos non corresponde."
@@ -3859,7 +3850,7 @@ msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3867,7 +3858,7 @@ msgstr "Nomine complete"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
@@ -3880,7 +3871,7 @@ msgstr "URL de tu pagina personal, blog o profilo in un altere sito."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3888,19 +3879,19 @@ msgstr[0] "Describe te e tu interesses in %d character"
msgstr[1] "Describe te e tu interesses in %d characteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Describe te e tu interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Bio"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3908,7 +3899,7 @@ msgid "Location"
msgstr "Loco"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
@@ -3962,7 +3953,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4248,7 +4239,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Error durante le configuration del usator."
@@ -4256,7 +4247,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Pardono, solmente le personas invitate pote registrar se."
@@ -4268,7 +4259,7 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
@@ -4276,19 +4267,19 @@ msgstr "Crear conto"
msgid "Registration not allowed."
msgstr "Creation de conto non permittite."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Le adresse de e-mail existe ja."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4296,62 +4287,62 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 o plus characteres. Requirite."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Identic al contrasigno hic supra. Requirite."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Usate solmente pro actualisationes, notificationes e recuperation de "
"contrasigno"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"io comprende que le contento e datos de %1$s es private e confidential."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Tote le derectos reservate."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4361,7 +4352,7 @@ msgstr ""
"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
"telephono."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4393,7 +4384,7 @@ msgstr ""
"\n"
"Gratias pro inscriber te, e nos spera que iste servicio te place."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6220,18 +6211,18 @@ msgstr "%1$s seque ora %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenite a %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "Codice in modo de usator singule appellate sin esser activate."
@@ -7310,24 +7301,24 @@ msgstr ""
"tracking - non ancora implementate.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Nulle file de configuration trovate."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Io cercava files de configuration in le sequente locos:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Considera executar le installator pro reparar isto."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Ir al installator."
@@ -8169,6 +8160,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Inviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Inviar un nota"
@@ -8405,7 +8414,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Pagina non trovate."
@@ -8661,64 +8670,64 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] "un minuta"
-msgstr[1] "%d minutas"
+msgstr[0] "circa un minuta retro"
+msgstr[1] "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "un hora"
-msgstr[1] "%d horas"
+msgstr[0] "circa un hora retro"
+msgstr[1] "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "un die"
-msgstr[1] "%d dies"
+msgstr[0] "circa un die retro"
+msgstr[1] "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "un mense"
-msgstr[1] "%d menses"
+msgstr[0] "circa un mense retro"
+msgstr[1] "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 58b86a511..b36ff5626 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:08+0000\n"
"Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -543,22 +543,13 @@ msgstr "Gat ekki uppfært notanda."
msgid "Could not find target user."
msgstr "Gat ekki uppfært notanda."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -566,9 +557,9 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ekki tækt stuttnefni."
@@ -577,10 +568,10 @@ msgstr "Ekki tækt stuttnefni."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Heimasíða er ekki gild vefslóð."
@@ -588,9 +579,9 @@ msgstr "Heimasíða er ekki gild vefslóð."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
@@ -603,9 +594,9 @@ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -616,9 +607,9 @@ msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
@@ -629,8 +620,8 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -639,7 +630,7 @@ msgstr[1] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ógilt merki: \"%s\""
@@ -648,8 +639,8 @@ msgstr "Ógilt merki: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -657,8 +648,8 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -856,7 +847,7 @@ msgstr "Aðgangur"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -866,7 +857,7 @@ msgstr "Stuttnefni"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lykilorð"
@@ -1975,25 +1966,25 @@ msgstr "Notaðu þetta eyðublað til að breyta hópnum."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ógilt merki: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Gat ekki uppfært hóp."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
#, fuzzy
msgid "Could not create aliases."
msgstr "Gat ekki búið til uppáhald."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Valmöguleikar vistaðir."
@@ -2144,7 +2135,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
@@ -3148,11 +3139,11 @@ msgstr "Innskráning"
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Muna eftir mér"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
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 "
@@ -3568,7 +3559,7 @@ msgid "6 or more characters"
msgstr "6 eða fleiri tákn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Staðfesta"
@@ -3580,11 +3571,11 @@ msgstr "Sama og lykilorðið hér fyrir ofan"
msgid "Change"
msgstr "Breyta"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Lykilorðin passa ekki saman."
@@ -3952,7 +3943,7 @@ msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3960,7 +3951,7 @@ msgstr "Fullt nafn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
@@ -3976,7 +3967,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3984,20 +3975,20 @@ msgstr[0] "Lýstu þér og áhugamálum þínum í 140 táknum"
msgstr[1] "Lýstu þér og áhugamálum þínum í 140 táknum"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Lýstu þér og þínum "
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Lýsing"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -4005,7 +3996,7 @@ msgid "Location"
msgstr "Staðsetning"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
@@ -4060,7 +4051,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4341,7 +4332,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Villa kom upp í stillingu notanda."
@@ -4349,7 +4340,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
@@ -4362,7 +4353,7 @@ msgstr "Villa kom upp varðandi staðfestingarlykilinn."
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -4370,88 +4361,88 @@ msgstr "Nýskrá"
msgid "Registration not allowed."
msgstr "Nýskráning ekki leyfð."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Tölvupóstfang er nú þegar skráð."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ótækt notendanafn eða lykilorð."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 eða fleiri tákn. Nauðsynlegt"
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Tölvupóstur"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4484,7 +4475,7 @@ msgstr ""
"\n"
"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6308,18 +6299,18 @@ msgstr "%1$s er að hlusta á bablið þitt á %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Skilaboð til %1$s á %2$s"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7393,26 +7384,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Enginn staðfestingarlykill."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Boðskort sent á eftirfarandi aðila:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -8159,6 +8150,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Senda"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Senda babl"
@@ -8404,7 +8413,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -8665,17 +8674,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8683,12 +8692,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8696,12 +8705,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8709,12 +8718,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8722,7 +8731,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 04f336f3c..027f2167c 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:36+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:09+0000\n"
"Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -537,24 +537,13 @@ msgstr "Impossibile determinare l'utente sorgente."
msgid "Could not find target user."
msgstr "Impossibile trovare l'utente destinazione."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"spazi."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Soprannome già in uso. Prova con un altro."
@@ -562,9 +551,9 @@ msgstr "Soprannome già in uso. Prova con un altro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Non è un soprannome valido."
@@ -573,10 +562,10 @@ msgstr "Non è un soprannome valido."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "L'indirizzo della pagina web non è valido."
@@ -584,9 +573,9 @@ msgstr "L'indirizzo della pagina web non è valido."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -599,9 +588,9 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -612,9 +601,9 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -625,8 +614,8 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -635,7 +624,7 @@ msgstr[1] "Troppi alias! Massimo %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Alias non valido: \"%s\"."
@@ -644,8 +633,8 @@ msgstr "Alias non valido: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
@@ -653,8 +642,8 @@ msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "L'alias non può essere lo stesso del soprannome."
@@ -855,7 +844,7 @@ msgstr "Account"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -865,7 +854,7 @@ msgstr "Soprannome"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
@@ -1952,24 +1941,24 @@ msgstr "Usa questo modulo per modificare il gruppo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Alias non valido: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Impossibile aggiornare il gruppo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Impossibile creare gli alias."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Opzioni salvate."
@@ -2119,7 +2108,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
@@ -3116,11 +3105,11 @@ msgstr "Accedi"
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Ricordami"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
@@ -3522,7 +3511,7 @@ msgid "6 or more characters"
msgstr "6 o più caratteri"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Conferma"
@@ -3534,11 +3523,11 @@ msgstr "Stessa password di sopra"
msgid "Change"
msgstr "Modifica"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Le password non corrispondono."
@@ -3907,7 +3896,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3915,7 +3904,7 @@ msgstr "Nome"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
@@ -3929,7 +3918,7 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3937,19 +3926,19 @@ msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Descrivi te e i tuoi interessi"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3957,7 +3946,7 @@ msgid "Location"
msgstr "Ubicazione"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Dove ti trovi, tipo \"città, regione, stato\""
@@ -4011,7 +4000,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4297,7 +4286,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Errore nell'impostare l'utente."
@@ -4305,7 +4294,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Solo le persone invitate possono registrarsi."
@@ -4317,7 +4306,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrati"
@@ -4325,19 +4314,19 @@ msgstr "Registrati"
msgid "Registration not allowed."
msgstr "Registrazione non consentita."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Indirizzo email già esistente."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nome utente o password non valido."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4346,61 +4335,61 @@ msgstr ""
"successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
"colleghi. "
-#: actions/register.php:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 o più caratteri; richiesta"
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Stessa password di sopra; richiesta"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Usata solo per aggiornamenti, annunci e recupero password"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Comprendo che i contenuti e i dati di %1$s sono privati e confidenziali."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Tutti i diritti riservati."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4410,7 +4399,7 @@ msgstr ""
"dati personali: password, indirizzo email, indirizzo messaggistica "
"istantanea e numero di telefono."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4444,7 +4433,7 @@ msgstr ""
"Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
"servizio."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6279,18 +6268,18 @@ msgstr "L'utente %1$s è entrato nel gruppo %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenuti su %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Nessun utente singolo definito per la modalità single-user."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7371,20 +7360,20 @@ msgstr ""
"tracking - non ancora implementato\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Non è stato trovato alcun file di configurazione. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "I file di configurazione sono stati cercati in questi posti: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
"Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -7392,7 +7381,7 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Vai al programma d'installazione."
@@ -8240,6 +8229,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Invia"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
+"spazi."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Invia un messaggio"
@@ -8476,7 +8485,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Metodo delle API non trovato."
@@ -8731,17 +8740,17 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8749,12 +8758,12 @@ msgstr[0] "circa un minuto fa"
msgstr[1] "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8762,12 +8771,12 @@ msgstr[0] "circa un'ora fa"
msgstr[1] "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8775,12 +8784,12 @@ msgstr[0] "circa un giorno fa"
msgstr[1] "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8788,7 +8797,7 @@ msgstr[0] "circa un mese fa"
msgstr[1] "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 699f89567..ca9c2e0fa 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:38+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:10+0000\n"
"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -535,24 +535,13 @@ msgstr "ソースユーザーを決定できません。"
msgid "Could not find target user."
msgstr "ターゲットユーザーを見つけられません。"
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
-"できません。"
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -560,9 +549,9 @@ msgstr "そのニックネームは既に使用されています。他のもの
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "有効なニックネームではありません。"
@@ -571,10 +560,10 @@ msgstr "有効なニックネームではありません。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "ホームページのURLが不適切です。"
@@ -582,9 +571,9 @@ msgstr "ホームページのURLが不適切です。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "フルネームが長すぎます。(255字まで)"
@@ -597,9 +586,9 @@ msgstr "フルネームが長すぎます。(255字まで)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -609,9 +598,9 @@ msgstr[0] "記述が長すぎます。(最長%d字)"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "場所が長すぎます。(255字まで)"
@@ -622,8 +611,8 @@ msgstr "場所が長すぎます。(255字まで)"
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -631,7 +620,7 @@ msgstr[0] "別名が多すぎます! 最大 %d。"
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "不正な別名: \"%s\""
@@ -640,8 +629,8 @@ msgstr "不正な別名: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
@@ -649,8 +638,8 @@ msgstr "別名 \"%s\" は既に使用されています。他のものを試し
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "別名はニックネームと同じではいけません。"
@@ -845,7 +834,7 @@ msgstr "アカウント"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -855,7 +844,7 @@ msgstr "ニックネーム"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "パスワード"
@@ -1945,24 +1934,24 @@ msgstr "このフォームを使ってグループを編集します。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "不正な別名: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "グループを更新できません。"
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "別名を作成できません。"
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "オプションが保存されました。"
@@ -2114,7 +2103,7 @@ msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効なメールアドレスではありません。"
@@ -3110,11 +3099,11 @@ msgstr "ログイン"
msgid "Login to site"
msgstr "サイトへログイン"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "ログイン状態を保持"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう!"
@@ -3517,7 +3506,7 @@ msgid "6 or more characters"
msgstr "6文字以上"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "パスワード確認"
@@ -3529,11 +3518,11 @@ msgstr "上と同じパスワード"
msgid "Change"
msgstr "変更"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "パスワードは6文字以上にする必要があります。"
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "パスワードが一致しません。"
@@ -3900,7 +3889,7 @@ msgstr "1-64文字の、小文字アルファベットか数字で、スペー
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3908,7 +3897,7 @@ msgstr "フルネーム"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
@@ -3922,26 +3911,26 @@ msgstr "ホームページ、ブログ、プロファイル、その他サイト
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "%d字以内で自分自身と自分の興味について書いてください"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "自分自身と自分の興味について書いてください"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "自己紹介"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3949,7 +3938,7 @@ msgid "Location"
msgstr "場所"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "自分のいる場所。例:「都市, 都道府県 (または地域), 国」"
@@ -4002,7 +3991,7 @@ msgstr "自分をフォローしている者を自動的にフォローする (B
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4289,7 +4278,7 @@ msgstr "パスワードは6字以上でなければいけません。"
msgid "Password and confirmation do not match."
msgstr "パスワードと確認が一致しません。"
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "ユーザ設定エラー"
@@ -4297,7 +4286,7 @@ msgstr "ユーザ設定エラー"
msgid "New password successfully saved. You are now logged in."
msgstr "新しいパスワードの保存に成功しました。ログインしています。"
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "すみません、招待された人々だけが登録できます。"
@@ -4309,7 +4298,7 @@ msgstr "すみません、不正な招待コード。"
msgid "Registration successful"
msgstr "登録成功"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -4317,19 +4306,19 @@ msgstr "登録"
msgid "Registration not allowed."
msgstr "登録は許可されていません。"
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "ライセンスに同意頂けない場合は登録できません。"
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "メールアドレスが既に存在します。"
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "不正なユーザ名またはパスワード。"
-#: actions/register.php:352
+#: actions/register.php:351
#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
@@ -4338,67 +4327,67 @@ msgstr ""
"このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
"同僚にリンクできます。 "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6文字以上。必須です。"
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "上のパスワードと同じです。 必須。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "メール"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "長い名前"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4431,7 +4420,7 @@ msgstr ""
"参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
"で使ってくれることを願っています。"
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6266,18 +6255,18 @@ msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "ようこそ %1$s、@%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "single-user モードのためのシングルユーザが定義されていません。"
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7326,20 +7315,20 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "コンフィギュレーションファイルがありません。 "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
"あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7347,7 +7336,7 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "インストーラへ。"
@@ -8159,6 +8148,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "投稿"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
+"できません。"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "つぶやきを送る"
@@ -8399,7 +8407,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "このグループからこのユーザをブロック"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API メソッドが見つかりません。"
@@ -8652,60 +8660,60 @@ msgid "Moderator"
msgstr "管理"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "数秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "約 1 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "約 1 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "約 1 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "約 1 ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index ecc777c52..192892d19 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:39+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:11+0000\n"
"Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ka\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -527,22 +527,13 @@ msgstr "ავტორი მომხმარებლის განსა
msgid "Could not find target user."
msgstr "სასურველი მომხმარებელი ვერ მოიძებნა."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -550,9 +541,9 @@ msgstr "მეტსახელი უკვე გამოყენებუ
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "მეტსახელი არასწორია."
@@ -561,10 +552,10 @@ msgstr "მეტსახელი არასწორია."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -572,9 +563,9 @@ msgstr "სასტარტო გვერდი არასწორი URL
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -587,9 +578,9 @@ msgstr "სრული სახელი ძალიან გრძელი
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -599,9 +590,9 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -612,8 +603,8 @@ msgstr "ადგილმდებარეობა ძალიან გრ
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -621,7 +612,7 @@ msgstr[0] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr ""
@@ -630,8 +621,8 @@ msgstr ""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
@@ -639,8 +630,8 @@ msgstr ""
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -833,7 +824,7 @@ msgstr "ანგარიში"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -843,7 +834,7 @@ msgstr "მეტსახელი"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "პაროლი"
@@ -1923,24 +1914,24 @@ msgstr "ჯგუფის რედაქტირებისათვის
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr ""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "ჯგუფის განახლება ვერ მოხერხდა."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr ""
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "პარამეტრები შენახულია."
@@ -2088,7 +2079,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "არასწორი ელ. ფოსტის მისამართი."
@@ -3077,11 +3068,11 @@ msgstr "შესვლა"
msgid "Login to site"
msgstr "საიტზე შესვლა"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "დამიმახსოვრე"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
@@ -3479,7 +3470,7 @@ msgid "6 or more characters"
msgstr "6 ან მეტი სიმბოლო"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "ვადასტურებ"
@@ -3491,11 +3482,11 @@ msgstr "იგივე რაც ზედა პაროლი"
msgid "Change"
msgstr "შეცვლა"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "პაროლები არ ემთხვევა."
@@ -3858,7 +3849,7 @@ msgstr "1–64 პატარა ასოები ან ციფრებ
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3866,7 +3857,7 @@ msgstr "სრული სახელი"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ვებ. გვერსი"
@@ -3880,26 +3871,26 @@ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "აღწერეთ საკუთარი თავი და თქვენი ინტერესები %d სიმბოლოთი"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "აღწერეთ საკუთარი თავი და თქვენი ინტერესები"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "ბიოგრაფია"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3907,7 +3898,7 @@ msgid "Location"
msgstr "მდებარეობა"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
@@ -3961,7 +3952,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4243,7 +4234,7 @@ msgstr "პაროლი უნდა შედგებოდეს 6 ან
msgid "Password and confirmation do not match."
msgstr "პაროლი და დასტური არ ემთხვევა."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
@@ -4251,7 +4242,7 @@ msgstr "მომხმარებელის დაყენებისა
msgid "New password successfully saved. You are now logged in."
msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "ბოდიშს გიხდით, დარეგისტრირება მხოლოდ მოწვევითაა შესაძლებელი."
@@ -4263,7 +4254,7 @@ msgstr "ბოდიშს გიხდით, მოსაწვევი კ
msgid "Registration successful"
msgstr "რეგისტრაცია წარმატებით დასრულდა"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "რეგისტრაცია"
@@ -4271,19 +4262,19 @@ msgstr "რეგისტრაცია"
msgid "Registration not allowed."
msgstr "რეგისტრაცია არ არის დაშვებული."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "ვერ დარეგისტრირდებით თუ არ დაეთანხმებით ლიცენზიის პირობებს."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "ელ. ფოსტის მისამართი უკვე არსებობს."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4291,40 +4282,40 @@ msgstr ""
"ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
"დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
"სავალდებულო."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "ელ. ფოსტა"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
"გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4332,23 +4323,23 @@ msgstr ""
"მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
"კონციდენციალური."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "ჩემი ტექსტის და ფაილების საავტორო უფლება ეკუტვნის %1$s–ს."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "ყველა უფლება დაცულია."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4357,7 +4348,7 @@ msgstr ""
"ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
"პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4390,7 +4381,7 @@ msgstr ""
"\n"
"გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6199,18 +6190,18 @@ msgstr "%1$s ამიერიდან ყურს უგდებს თქ
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "გამარჯობა @%2$s, კეთილი იყოს თქვენი მობრძანება %1$s-ზე!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "ერთი მომხმარებელი არ განსაზღვრულა ერთარედთი-მომხმარებლის რეჟიმისთვის."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7244,26 +7235,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "კონფიგურაციის ფაილი ვერ მოიძებნა. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "კონფიგურაციის ფაილები შემდეგ ადგილებში ვეძებე: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "თუ გინდათ ინსტალატორი გაუშვით ამის გასასწორებლად."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "გადადი ამ ინსტალატორზე."
@@ -8084,6 +8075,23 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "გაგზავნა"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "შეტყობინების გაგზავნა"
@@ -8320,7 +8328,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "ჩამოართვი \"%s\" როლი ამ მომხმარებელს"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API მეთოდი ვერ მოიძებნა."
@@ -8572,60 +8580,60 @@ msgid "Moderator"
msgstr "მოდერატორი"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "რამდენიმე წამის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "დაახლოებით 1 წუთის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "დაახლოებით 1 საათის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "დაახლოებით 1 დღის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "დაახლოებით 1 თვის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "დაახლოებით 1 წლის წინ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index c1b3ab219..6d3faf530 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:40+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:12+0000\n"
"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -524,24 +524,13 @@ msgstr "소스 이용자를 확인할 수 없습니다."
msgid "Could not find target user."
msgstr "타겟 이용자를 찾을 수 없습니다."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
-"다."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -549,9 +538,9 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "유효한 별명이 아닙니다"
@@ -560,10 +549,10 @@ msgstr "유효한 별명이 아닙니다"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -571,9 +560,9 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -586,9 +575,9 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -598,9 +587,9 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -611,8 +600,8 @@ msgstr "위치가 너무 깁니다. (최대 255글자)"
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -620,7 +609,7 @@ msgstr[0] "별명이 너무 많습니다! 최대 %d개."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "사용할 수 없는 별명 : \"%s\""
@@ -629,8 +618,8 @@ msgstr "사용할 수 없는 별명 : \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -638,8 +627,8 @@ msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -839,7 +828,7 @@ msgstr "계정"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -849,7 +838,7 @@ msgstr "별명"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "비밀 번호"
@@ -1927,24 +1916,24 @@ msgstr "다음 양식을 이용해 그룹을 편집하십시오."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "사용할 수 없는 별명 : \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "그룹을 업데이트 할 수 없습니다."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "관심소식을 생성할 수 없습니다."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "옵션을 저장했습니다."
@@ -2090,7 +2079,7 @@ msgid "Cannot normalize that email address"
msgstr "메일 주소를 정규화 할 수 없습니다."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "올바른 메일 주소가 아닙니다."
@@ -3059,11 +3048,11 @@ msgstr "로그인"
msgid "Login to site"
msgstr "사이트에 로그인하세요."
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "자동 로그인"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
@@ -3463,7 +3452,7 @@ msgid "6 or more characters"
msgstr "6글자 이상"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "인증"
@@ -3475,11 +3464,11 @@ msgstr "위와 같은 비밀 번호"
msgid "Change"
msgstr "변경"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "비밀번호는 6자리 이상이어야 합니다."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "비밀 번호가 일치하지 않습니다."
@@ -3839,7 +3828,7 @@ msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3847,7 +3836,7 @@ msgstr "실명"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페이지"
@@ -3861,26 +3850,26 @@ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "%d자 이내에서 자기 소개 및 자기 관심사"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "자기 소개 및 자기 관심사"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "자기소개"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3888,7 +3877,7 @@ msgid "Location"
msgstr "위치"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
@@ -3939,7 +3928,7 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4217,7 +4206,7 @@ msgstr "비밀 번호는 6자 이상이어야 합니다."
msgid "Password and confirmation do not match."
msgstr "비밀 번호가 일치하지 않습니다."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "사용자 세팅 오류"
@@ -4226,7 +4215,7 @@ msgid "New password successfully saved. You are now logged in."
msgstr ""
"새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
@@ -4239,7 +4228,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "등록"
@@ -4247,86 +4236,86 @@ msgstr "등록"
msgid "Registration not allowed."
msgstr "가입이 허용되지 않습니다."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "이메일 주소가 이미 존재 합니다."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
"입력."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6글자 이상이 필요합니다."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "위와 같은 비밀 번호. 필수 사항."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "메일"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "더욱 긴 이름을 요구합니다."
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
-#: actions/register.php:525
+#: actions/register.php:524
#, fuzzy, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "글과 파일의 저작권은 %1$s의 소유입니다"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4359,7 +4348,7 @@ msgstr ""
"\n"
"다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6156,18 +6145,18 @@ msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다.
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s에 답신"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7205,26 +7194,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "확인 코드가 없습니다."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "다음 사람들에게 초대권을 보냈습니다:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "이 사이트에 로그인"
@@ -7960,6 +7949,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "보내기"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
+"다."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "게시글 보내기"
@@ -8198,7 +8206,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "그룹 이용자는 차단해제"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API 메서드 발견 안 됨."
@@ -8452,60 +8460,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 971db2ff8..56679d9c3 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:56:17+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:13+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -448,8 +448,8 @@ msgstr "Нема текст за пораката!"
#, php-format
msgid "That's too long. Maximum message size is %d character."
msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Ова е предолго. Дозволен е највеќе %d знак"
-msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци"
+msgstr[0] "Ова е предолго. Дозволен е највеќе %d знак во пораката."
+msgstr[1] "Ова е предолго. Дозволени се највеќе %d знаци во пораката."
#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
@@ -537,22 +537,13 @@ msgstr "Не можев да го утврдам целниот корисник
msgid "Could not find target user."
msgstr "Не можев да го пронајдам целниот корисник."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
@@ -560,9 +551,9 @@ msgstr "Тој прекар е во употреба. Одберете друг.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неправилен прекар."
@@ -571,10 +562,10 @@ msgstr "Неправилен прекар."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Главната страница не е важечка URL-адреса."
@@ -582,9 +573,9 @@ msgstr "Главната страница не е важечка URL-адрес
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -596,9 +587,9 @@ msgstr "Полното име е предолго (највеќе 255 знаци
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -609,9 +600,9 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -621,8 +612,8 @@ msgstr "Местоположбата е предолга (највеќе 255 з
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -631,7 +622,7 @@ msgstr[1] "Премногу алијаси! Дозволено е највеќе
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Неважечки алијас: „%s“."
@@ -640,8 +631,8 @@ msgstr "Неважечки алијас: „%s“."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Алијасот „%s“ е зафатен. Одберете друг."
@@ -649,8 +640,8 @@ msgstr "Алијасот „%s“ е зафатен. Одберете друг."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Алијасот не може да биде ист како прекарот."
@@ -845,7 +836,7 @@ msgstr "Сметка"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -855,7 +846,7 @@ msgstr "Прекар"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Лозинка"
@@ -1929,24 +1920,24 @@ msgstr "ОБразецов служи за уредување на групат
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Неважечки алијас: „%s“"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Не можев да ја подновам групата."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Не можеше да се создадат алијаси."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Нагодувањата се зачувани."
@@ -2095,7 +2086,7 @@ msgid "Cannot normalize that email address"
msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилна адреса за е-пошта."
@@ -3093,11 +3084,11 @@ msgstr "Најава"
msgid "Login to site"
msgstr "Најавете се"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Запамети ме"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
@@ -3501,7 +3492,7 @@ msgid "6 or more characters"
msgstr "6 или повеќе знаци"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Потврди"
@@ -3513,11 +3504,11 @@ msgstr "Исто како лозинката погоре"
msgid "Change"
msgstr "Промени"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Лозинката мора да содржи барем 6 знаци."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Лозинките не се совпаѓаат."
@@ -3867,7 +3858,7 @@ msgstr "1-64 мали букви или бројки, без интерпукц
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3875,7 +3866,7 @@ msgstr "Цело име"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна страница"
@@ -3889,7 +3880,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3897,19 +3888,19 @@ msgstr[0] "Опишете се себеси и своите интереси с
msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Опишете се себеси и Вашите интереси"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Биографија"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3917,7 +3908,7 @@ msgid "Location"
msgstr "Местоположба"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
@@ -3973,7 +3964,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4262,7 +4253,7 @@ msgstr "Лозинката мора да има барем 6 знаци."
msgid "Password and confirmation do not match."
msgstr "Двете лозинки не се совпаѓаат."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Грешка во поставувањето на корисникот."
@@ -4270,7 +4261,7 @@ msgstr "Грешка во поставувањето на корисникот."
msgid "New password successfully saved. You are now logged in."
msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Жалиме, регистрацијата е само со покана."
@@ -4282,7 +4273,7 @@ msgstr "Жалиме, неважечки код за поканата."
msgid "Registration successful"
msgstr "Регистрацијата е успешна"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -4290,19 +4281,19 @@ msgstr "Регистрирај се"
msgid "Registration not allowed."
msgstr "Регистрирањето не е дозволено."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Адресата веќе постои."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Погрешно име или лозинка."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4310,63 +4301,63 @@ msgstr ""
"Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
"објавувате забелешки и да се поврзувате со пријатели и колеги. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
"Задолжително поле."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "Барем 6 знаци. Задолжително поле."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Исто што и лозинката погоре. Задолжително поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Е-пошта"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Подолго име, по можност Вашето вистинско име и презиме"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL на Вашата домашна страница, блог или профил на друго мрежно место."
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Сфаќам дека содржината и податоците на %1$s се лични и доверливи."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторското правво на мојот текст и податотеки го има %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Сите права задржани."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4375,7 +4366,7 @@ msgstr ""
"Мојот текст и податотеки се достапни под %s, освен следниве приватни "
"податоци: лозинка, е-пошта, IM-адреса и телефонски број."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4409,7 +4400,7 @@ msgstr ""
"Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
"служба."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6248,18 +6239,18 @@ msgstr "%1$s сега го/ја следи %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Не е зададен корисник за еднокорисничкиот режим."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "Повикан е еднокориснички режим, но не е овозможен."
@@ -6870,7 +6861,7 @@ msgstr "Откажи"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "од "
+msgstr " од "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7336,24 +7327,24 @@ msgstr ""
"tracking - сè уште не е имплементирано.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Нема пронајдено податотека со поставки."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Пребарав податотеки со поставки на следниве места:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Оди на инсталаторот."
@@ -8195,6 +8186,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Прати"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Испрати забелешка"
@@ -8431,7 +8440,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на корисников"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Страницата не е пронајдена."
@@ -8682,17 +8691,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "пред неколку секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8700,12 +8709,12 @@ msgstr[0] "пред околу една минута"
msgstr[1] "пред околу %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "пред еден час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8713,12 +8722,12 @@ msgstr[0] "пред околу еден час"
msgstr[1] "пред околу %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8726,12 +8735,12 @@ msgstr[0] "пред околу еден ден"
msgstr[1] "пред околу %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "пред еден месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8739,7 +8748,7 @@ msgstr[0] "пред околу еден месец"
msgstr[1] "пред околу %d месеци"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "пред една година"
@@ -8799,5 +8808,5 @@ msgstr "Нема назначено корисник. Ќе го употреба
#, php-format
msgid "%d entry in backup."
msgid_plural "%d entries in backup."
-msgstr[0] "%d резервна ставка."
-msgstr[1] "%d резервни ставки."
+msgstr[0] "Има %d резервна ставка."
+msgstr[1] "Има %d резервни ставки."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 24df828ef..1143a8963 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:45+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:16+0000\n"
"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -535,22 +535,13 @@ msgstr "Kunne ikke bestemme kildebruker."
msgid "Could not find target user."
msgstr "Kunne ikke finne målbruker."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -558,9 +549,9 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ugyldig nick."
@@ -569,10 +560,10 @@ msgstr "Ugyldig nick."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -580,9 +571,9 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -594,9 +585,9 @@ msgstr "Fullt navn er for langt (maks 255 tegn)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -607,9 +598,9 @@ msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -619,8 +610,8 @@ msgstr "Plasseringen er for lang (maks 255 tegn)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -629,7 +620,7 @@ msgstr[1] "For mange alias. Maks %d er tillatt."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ugyldig alias: «%s»."
@@ -638,8 +629,8 @@ msgstr "Ugyldig alias: «%s»."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
@@ -647,8 +638,8 @@ msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias kan ikke være det samme som kallenavn."
@@ -846,7 +837,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -856,7 +847,7 @@ msgstr "Nick"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
@@ -1931,24 +1922,24 @@ msgstr "Bruk dette skjemaet for å redigere gruppen."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ugyldig alias: «%s»"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Kunne ikke oppdatere gruppe."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Kunne ikke opprette alias."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Lagret valg."
@@ -2094,7 +2085,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
@@ -2765,7 +2756,7 @@ msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s."
#: actions/invite.php:77
#, fuzzy, php-format
msgid "Invalid email address: %s."
-msgstr "Ugyldig e-postadresse: $s."
+msgstr "Ugyldig e-postadresse: %s."
#. TRANS: Page title when invitations have been sent.
#: actions/invite.php:116
@@ -3073,11 +3064,11 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn på nettstedet"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Husk meg"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
@@ -3314,7 +3305,7 @@ msgstr "Du er ikke bruker av dette programmet."
#: actions/oauthconnectionssettings.php:183
#, fuzzy, php-format
msgid "Unable to revoke access for application: %s."
-msgstr "Kunne ikke fjerne tilgang for applikasjonen: $s."
+msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
#. TRANS: Success message after revoking access for an application.
#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3477,7 +3468,7 @@ msgid "6 or more characters"
msgstr "6 eller flere tegn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bekreft"
@@ -3489,11 +3480,11 @@ msgstr "Samme som passord ovenfor"
msgid "Change"
msgstr "Endre"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 tegn."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Passordene var ikke like."
@@ -3842,7 +3833,7 @@ msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3850,7 +3841,7 @@ msgstr "Fullt navn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
@@ -3863,27 +3854,27 @@ msgstr "Adressen til din hjemmeside, blogg eller profil på et annet nettsted."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "Beskriv deg selv og dine interesser på %d tegn"
-msgstr[1] ""
+msgstr[1] "Beskriv deg selv og dine interesser på %d tegn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Beskriv degselv og dine interesser"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Om meg"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3891,7 +3882,7 @@ msgid "Location"
msgstr "Plassering"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
@@ -3945,12 +3936,12 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "Biografien er for lang (maks %d tegn)."
-msgstr[1] ""
+msgstr[1] "Biografien er for lang (maks %d tegn)."
#. TRANS: Validation error in form for profile settings.
#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
@@ -4232,7 +4223,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Feil ved innstilling av bruker."
@@ -4240,7 +4231,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Beklager, kun inviterte personer kan registrere seg."
@@ -4252,7 +4243,7 @@ msgstr "Beklager, ugyldig invitasjonskode."
msgid "Registration successful"
msgstr "Registrering vellykket"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrer"
@@ -4260,19 +4251,19 @@ msgstr "Registrer"
msgid "Registration not allowed."
msgstr "Registrering ikke tillatt."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "E-postadressen finnes allerede."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4280,59 +4271,59 @@ 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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 eller flere tegn. Påkrevd."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Samme som passord over. Kreves."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-post"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Alle rettigheter reservert."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4341,7 +4332,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4374,7 +4365,7 @@ msgstr ""
"\n"
"Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6184,18 +6175,18 @@ msgstr "%1$s lytter nå til dine notiser på %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Velkommen til %1$s, @%2$s."
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7243,26 +7234,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen konfigurasjonsfil funnet. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "Log inn på nettstedet"
@@ -8104,6 +8095,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Send"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Send en notis"
@@ -8346,7 +8355,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Blokker denne brukeren fra denne gruppen"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API-metode ikke funnet!"
@@ -8604,17 +8613,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8622,12 +8631,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8635,12 +8644,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8648,12 +8657,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8661,7 +8670,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 599fc91e4..6c5081efe 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:56:18+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:14+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -540,24 +540,13 @@ msgstr "Het was niet mogelijk de brongebruiker te bepalen."
msgid "Could not find target user."
msgstr "Het was niet mogelijk de doelgebruiker te vinden."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"zijn niet toegestaan."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
@@ -566,9 +555,9 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ongeldige gebruikersnaam!"
@@ -577,10 +566,10 @@ msgstr "Ongeldige gebruikersnaam!"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "De thuispagina is geen geldige URL."
@@ -588,9 +577,9 @@ msgstr "De thuispagina is geen geldige URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -602,9 +591,9 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -615,9 +604,9 @@ msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -627,8 +616,8 @@ msgstr "De locatie is te lang (maximaal 255 tekens)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -637,7 +626,7 @@ msgstr[1] "Te veel aliassen! Het maximale aantal is %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ongeldige alias: \"%s\"."
@@ -646,8 +635,8 @@ msgstr "Ongeldige alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
@@ -655,8 +644,8 @@ msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
@@ -855,7 +844,7 @@ msgstr "Gebruikersgegevens"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -865,7 +854,7 @@ msgstr "Gebruikersnaam"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Wachtwoord"
@@ -1941,24 +1930,24 @@ msgstr "Gebruik dit formulier om de groep te bewerken."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ongeldige alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Het was niet mogelijk de groep bij te werken."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Het was niet mogelijk de aliassen aan te maken."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "De instellingen zijn opgeslagen."
@@ -2106,7 +2095,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
@@ -3109,11 +3098,11 @@ msgstr "Aanmelden"
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
@@ -3519,7 +3508,7 @@ msgid "6 or more characters"
msgstr "Zes of meer tekens"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bevestigen"
@@ -3531,11 +3520,11 @@ msgstr "Gelijk aan het wachtwoord hierboven"
msgid "Change"
msgstr "Wijzigen"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Het wachtwoord moet zes of meer tekens bevatten."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "De wachtwoorden komen niet overeen."
@@ -3885,7 +3874,7 @@ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3893,7 +3882,7 @@ msgstr "Volledige naam"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
@@ -3906,7 +3895,7 @@ msgstr "De URL van uw thuispagina, blog of profiel bij een andere website."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3914,19 +3903,19 @@ msgstr[0] "Beschrijf uzelf en uw interesses in %d teken"
msgstr[1] "Beschrijf uzelf en uw interesses in %d tekens"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Beschrijf uzelf en uw interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Beschrijving"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3934,7 +3923,7 @@ msgid "Location"
msgstr "Locatie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
@@ -3989,7 +3978,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4283,7 +4272,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
@@ -4291,7 +4280,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
@@ -4303,7 +4292,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -4311,19 +4300,19 @@ msgstr "Registreren"
msgid "Registration not allowed."
msgstr "Registratie is niet toegestaan."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Het e-mailadres bestaat al."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4331,60 +4320,60 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "Zes of meer tekens. Verplicht"
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Een langere naam, mogelijk uw echte naam"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Ik begrijp dat inhoud en gegevens van %1$s persoonlijk en vertrouwelijk zijn."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Ik ben de rechthebbende voor mijn teksten en bestanden."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Alle rechten voorbehouden."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4393,7 +4382,7 @@ msgstr ""
"Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
"privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4427,7 +4416,7 @@ msgstr ""
"Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
"ervan verwacht."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6282,18 +6271,18 @@ msgstr "%1$s is %2$s gaan volgen."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
"De \"single-user\"-modus is aangeroepen terwijl deze niet is ingeschakeld."
@@ -7382,25 +7371,25 @@ msgstr ""
"tracking - nog niet beschikbaar\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Er is geen instellingenbestand aangetroffen."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -8240,6 +8229,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Verzenden"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+"zijn niet toegestaan."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Mededeling verzenden"
@@ -8476,7 +8485,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "De pagina is niet aangetroffen."
@@ -8734,17 +8743,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8752,12 +8761,12 @@ msgstr[0] "ongeveer een minuut geleden"
msgstr[1] "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8765,12 +8774,12 @@ msgstr[0] "ongeveer een uur geleden"
msgstr[1] "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8778,12 +8787,12 @@ msgstr[0] "ongeveer een dag geleden"
msgstr[1] "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8791,7 +8800,7 @@ msgstr[0] "ongeveer een maand geleden"
msgstr[1] "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 776f3bf6a..fd99e5b67 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:44+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:15+0000\n"
"Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -541,22 +541,13 @@ msgstr "Kan ikkje oppdatera brukar."
msgid "Could not find target user."
msgstr "Kan ikkje oppdatera brukar."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -564,9 +555,9 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Ikkje eit gyldig brukarnamn."
@@ -575,10 +566,10 @@ msgstr "Ikkje eit gyldig brukarnamn."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -586,9 +577,9 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -601,9 +592,9 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -614,9 +605,9 @@ msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -627,8 +618,8 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -637,7 +628,7 @@ msgstr[1] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, fuzzy, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ugyldig merkelapp: %s"
@@ -646,8 +637,8 @@ msgstr "Ugyldig merkelapp: %s"
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -655,8 +646,8 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -854,7 +845,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -864,7 +855,7 @@ msgstr "Kallenamn"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
@@ -1973,25 +1964,25 @@ msgstr "Bruk dette skjemaet for å redigere gruppa"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ugyldig merkelapp: %s"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Kann ikkje oppdatera gruppa."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
#, fuzzy
msgid "Could not create aliases."
msgstr "Kunne ikkje lagre favoritt."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Lagra innstillingar."
@@ -2142,7 +2133,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
@@ -3131,11 +3122,11 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Hugs meg"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
@@ -3546,7 +3537,7 @@ msgid "6 or more characters"
msgstr "6 eller fleire teikn"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Godta"
@@ -3558,11 +3549,11 @@ msgstr "Samme passord som over"
msgid "Change"
msgstr "Endra"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Passord må være minst 6 teikn."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Passorda var ikkje like."
@@ -3930,7 +3921,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3938,7 +3929,7 @@ msgstr "Fullt namn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
@@ -3952,7 +3943,7 @@ msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3960,20 +3951,20 @@ msgstr[0] "Skriv om deg og interessene dine med 140 teikn"
msgstr[1] "Skriv om deg og interessene dine med 140 teikn"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Skildra deg sjølv og din"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Om meg"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3981,7 +3972,7 @@ msgid "Location"
msgstr "Plassering"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
@@ -4035,7 +4026,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4319,7 +4310,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Feil ved å setja brukar."
@@ -4327,7 +4318,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Beklage, men kun inviterte kan registrere seg."
@@ -4340,7 +4331,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -4348,80 +4339,80 @@ msgstr "Registrér"
msgid "Registration not allowed."
msgstr "Registrering ikkje tillatt."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Epostadressa finst allereie."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ugyldig brukarnamn eller passord."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 eller fleire teikn. Kravd."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Samme som passord over. Påkrevd."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Epost"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4430,7 +4421,7 @@ msgstr ""
" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
"telefonnummer."
-#: actions/register.php:590
+#: actions/register.php:589
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4462,7 +4453,7 @@ msgstr ""
"\n"
"Takk for at du blei med, og vi håpar du vil lika tenesta!"
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6283,18 +6274,18 @@ msgstr "%1$s høyrer no på notisane dine på %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7362,26 +7353,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen stadfestingskode."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Invitasjon(er) sendt til fylgjande folk:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -8131,6 +8122,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Send"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Send ei melding"
@@ -8376,7 +8385,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Ei liste over brukarane i denne gruppa."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Fann ikkje API-metode."
@@ -8638,17 +8647,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8656,12 +8665,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8669,12 +8678,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8682,12 +8691,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8695,7 +8704,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 b8c5cd9b9..1fad5ba78 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:46+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:17+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -544,22 +544,13 @@ msgstr "Nie można określić użytkownika źródłowego."
msgid "Could not find target user."
msgstr "Nie można odnaleźć użytkownika docelowego."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -567,9 +558,9 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "To nie jest prawidłowy pseudonim."
@@ -578,10 +569,10 @@ msgstr "To nie jest prawidłowy pseudonim."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -589,9 +580,9 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
@@ -603,9 +594,9 @@ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -617,9 +608,9 @@ msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -629,8 +620,8 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -640,7 +631,7 @@ msgstr[2] "Za dużo aliasów. Maksymalnie dozwolone jest %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Nieprawidłowy alias: \"%s\"."
@@ -649,8 +640,8 @@ msgstr "Nieprawidłowy alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
@@ -658,8 +649,8 @@ msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias nie może być taki sam jak pseudonim."
@@ -854,7 +845,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -864,7 +855,7 @@ msgstr "Pseudonim"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hasło"
@@ -1935,24 +1926,24 @@ msgstr "Użyj tego formularza, aby zmodyfikować grupę."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Nieprawidłowy alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Nie można zaktualizować grupy."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Nie można utworzyć aliasów."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Zapisano opcje."
@@ -2099,7 +2090,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
@@ -3091,11 +3082,11 @@ msgstr "Zaloguj się"
msgid "Login to site"
msgstr "Zaloguj się na witrynie"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Zapamiętaj mnie"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
@@ -3498,7 +3489,7 @@ msgid "6 or more characters"
msgstr "6 lub więcej znaków"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Potwierdź"
@@ -3510,11 +3501,11 @@ msgstr "Takie samo jak powyższe hasło"
msgid "Change"
msgstr "Zmień"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Hasła nie pasują do siebie."
@@ -3864,7 +3855,7 @@ msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3872,7 +3863,7 @@ msgstr "Imię i nazwisko"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
@@ -3885,7 +3876,7 @@ msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3894,19 +3885,19 @@ msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Opisz się i swoje zainteresowania"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "O mnie"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3914,7 +3905,7 @@ msgid "Location"
msgstr "Położenie"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
@@ -3968,7 +3959,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4255,7 +4246,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Błąd podczas ustawiania użytkownika."
@@ -4263,7 +4254,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Tylko zaproszone osoby mogą się rejestrować."
@@ -4275,7 +4266,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -4283,20 +4274,20 @@ msgstr "Zarejestruj się"
msgid "Registration not allowed."
msgstr "Rejestracja nie jest dozwolona."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Adres e-mail już istnieje."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4304,60 +4295,60 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 lub więcej znaków. Wymagane."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Rozumiem, że treść i dane %1$s są prywatne i poufne."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
msgstr "Moje teksty i pliki pozostają pod moimi prawami autorskimi."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Wszystkie prawa zastrzeżone."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4366,7 +4357,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4399,7 +4390,7 @@ msgstr ""
"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
"sprawi ci przyjemność."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6241,19 +6232,19 @@ msgstr "Użytkownik %1$s obserwuje teraz %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s."
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "Wywołano kod pojedynczego użytkownika, kiedy nie był włączony."
@@ -6865,7 +6856,7 @@ msgstr "Anuluj"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "autorstwa "
+msgstr " autorstwa "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7337,24 +7328,24 @@ msgstr ""
"tracking - jeszcze nie zaimplementowano\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Nie odnaleziono pliku konfiguracji."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Szukano plików konfiguracji w następujących miejscach:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Należy uruchomić instalator, aby to naprawić."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Przejdź do instalatora."
@@ -8202,6 +8193,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Wyślij"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Wyślij wpis"
@@ -8438,7 +8448,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Unieważnij rolę \"%s\" tego użytkownika"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Nie odnaleziono strony."
@@ -8696,17 +8706,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8715,12 +8725,12 @@ msgstr[1] "około %d minut temu"
msgstr[2] "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8729,12 +8739,12 @@ msgstr[1] "około %d godzin temu"
msgstr[2] "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8743,12 +8753,12 @@ msgstr[1] "około %d dni temu"
msgstr[2] "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8757,7 +8767,7 @@ msgstr[1] "około %d miesięcy temu"
msgstr[2] "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 30ecb3dec..3491a0a35 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:48+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:18+0000\n"
"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -538,22 +538,13 @@ msgstr "Não foi possível determinar o utilizador de origem."
msgid "Could not find target user."
msgstr "Não foi possível encontrar o utilizador de destino."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Utilizador já é usado. Tente outro."
@@ -561,9 +552,9 @@ msgstr "Utilizador já é usado. Tente outro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Utilizador não é válido."
@@ -572,10 +563,10 @@ msgstr "Utilizador não é válido."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Página de ínicio não é uma URL válida."
@@ -583,9 +574,9 @@ msgstr "Página de ínicio não é uma URL válida."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -598,9 +589,9 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -611,9 +602,9 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -624,8 +615,8 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -634,7 +625,7 @@ msgstr[1] "Demasiados nomes alternativos! Máx. %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Nome alternativo inválido: \"%s\""
@@ -643,8 +634,8 @@ msgstr "Nome alternativo inválido: \"%s\""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
@@ -652,8 +643,8 @@ msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
@@ -853,7 +844,7 @@ msgstr "Conta"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -863,7 +854,7 @@ msgstr "Utilizador"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
@@ -1951,24 +1942,24 @@ msgstr "Use este formulário para editar o grupo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Nome alternativo inválido: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Não foi possível actualizar o grupo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Não foi possível criar os nomes alternativos."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Opções gravadas."
@@ -2119,7 +2110,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
@@ -3112,11 +3103,11 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Lembrar-me neste computador"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"De futuro, iniciar sessão automaticamente. Não usar em computadores "
@@ -3516,7 +3507,7 @@ msgid "6 or more characters"
msgstr "6 ou mais caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmação"
@@ -3528,11 +3519,11 @@ msgstr "Repita a senha nova"
msgid "Change"
msgstr "Modificar"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Senha tem de ter 6 ou mais caracteres."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Senhas não coincidem."
@@ -3900,7 +3891,7 @@ msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3908,7 +3899,7 @@ msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
@@ -3922,7 +3913,7 @@ msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3930,19 +3921,19 @@ msgstr[0] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
msgstr[1] "Descreva-se e aos seus interesses (máx. 140 caracteres)"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Descreva-se e aos seus interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografia"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3950,7 +3941,7 @@ msgid "Location"
msgstr "Localidade"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde está, por ex. \"Cidade, Região, País\""
@@ -4003,7 +3994,7 @@ msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4295,7 +4286,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Erro ao configurar utilizador."
@@ -4303,7 +4294,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Desculpe, só pessoas convidadas se podem registar."
@@ -4315,7 +4306,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -4323,19 +4314,19 @@ msgstr "Registar"
msgid "Registration not allowed."
msgstr "Registo não é permitido."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Correio electrónico já existe."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nome de utilizador ou senha inválidos."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4343,64 +4334,64 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 ou mais caracteres. Obrigatório."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Repita a senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Correio"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Compreendo que o conteúdo e dados do site %1$s são privados e confidenciais."
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4410,7 +4401,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4443,7 +4434,7 @@ msgstr ""
"\n"
"Obrigado por se ter registado e esperamos que se divirta usando este serviço."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6281,18 +6272,18 @@ msgstr "%1$s está agora a ouvir as suas notas em %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Nenhum utilizador único definido para o modo de utilizador único."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7369,26 +7360,26 @@ msgstr ""
"tracking - ainda não implementado.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ficheiro de configuração não encontrado. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Talvez queira correr o instalador para resolver esta questão."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -8234,6 +8225,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Enviar uma nota"
@@ -8470,7 +8479,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Retirar a função \"%s\" a este utilizador"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Método da API não encontrado."
@@ -8726,64 +8735,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] "um minuto"
-msgstr[1] "%d minutos"
+msgstr[0] "há cerca de um minuto atrás"
+msgstr[1] "há cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "uma hora"
-msgstr[1] "%d horas"
+msgstr[0] "há cerca de uma hora atrás"
+msgstr[1] "há cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "um dia"
-msgstr[1] "%d dias"
+msgstr[0] "há cerca de um dia atrás"
+msgstr[1] "há cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "um mês"
-msgstr[1] "%d meses"
+msgstr[0] "há cerca de um mês atrás"
+msgstr[1] "há cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 b5514e985..f00cb28fa 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:49+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:19+0000\n"
"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
"br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -545,24 +545,13 @@ msgstr "Não foi possível determinar o usuário de origem."
msgid "Could not find target user."
msgstr "Não foi possível encontrar usuário de destino."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"ter e espaços."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Esta identificação já está em uso. Tente outro."
@@ -570,9 +559,9 @@ msgstr "Esta identificação já está em uso. Tente outro."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Não é uma identificação válida."
@@ -581,10 +570,10 @@ msgstr "Não é uma identificação válida."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "A URL informada não é válida."
@@ -592,9 +581,9 @@ msgstr "A URL informada não é válida."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -606,9 +595,9 @@ msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -619,9 +608,9 @@ msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -631,8 +620,8 @@ msgstr "A localização é muito extensa (máx. 255 caracteres)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -641,7 +630,7 @@ msgstr[1] "Muitos apelidos! O máximo são %d."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Apelido inválido: \"%s\"."
@@ -650,8 +639,8 @@ msgstr "Apelido inválido: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "O apelido \"%s\" já está em uso. Tente outro."
@@ -659,8 +648,8 @@ msgstr "O apelido \"%s\" já está em uso. Tente outro."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "O apelido não pode ser igual à identificação."
@@ -857,7 +846,7 @@ msgstr "Conta"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -867,7 +856,7 @@ msgstr "Usuário"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
@@ -1954,24 +1943,24 @@ msgstr "Use esse formulário para editar o grupo."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Apelido inválido: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Não foi possível atualizar o grupo."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Não foi possível criar os apelidos."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "As configurações foram salvas."
@@ -2121,7 +2110,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
@@ -3120,11 +3109,11 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Lembrar neste computador"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
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 "
@@ -3530,7 +3519,7 @@ msgid "6 or more characters"
msgstr "No mínimo 6 caracteres"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Confirmar"
@@ -3542,11 +3531,11 @@ msgstr "Igual à senha acima"
msgid "Change"
msgstr "Alterar"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
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:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "As senhas não coincidem."
@@ -3914,7 +3903,7 @@ msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3922,7 +3911,7 @@ msgstr "Nome completo"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
@@ -3936,7 +3925,7 @@ msgstr "URL do seu site, blog ou perfil em outro site"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3944,19 +3933,19 @@ msgstr[0] "Descreva a si mesmo e os seus interesses em %d caracteres"
msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Descreva a si mesmo e os seus interesses"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Descrição"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3964,7 +3953,7 @@ msgid "Location"
msgstr "Localização"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
@@ -4018,7 +4007,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4309,7 +4298,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Erro na configuração do usuário."
@@ -4319,7 +4308,7 @@ msgstr ""
"A nova senha foi salva com sucesso. A partir de agora você já está "
"autenticado."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Desculpe, mas somente convidados podem se registrar."
@@ -4331,7 +4320,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -4339,19 +4328,19 @@ msgstr "Registrar-se"
msgid "Registration not allowed."
msgstr "Não é permitido o registro."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "O endereço de e-mail já existe."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Nome de usuário e/ou senha inválido(s)"
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4359,38 +4348,38 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "No mínimo 6 caracteres. Obrigatório."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Igual à senha acima. Obrigatório."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-mail"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Nome completo, de preferência seu nome \"real\""
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL do seu site, blog ou perfil em outro site"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4398,23 +4387,23 @@ msgstr ""
"Eu entendo que o conteúdo e os dados de %1$s são particulares e "
"confidenciais."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4424,7 +4413,7 @@ msgstr ""
"particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
"e número de telefone."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4457,7 +4446,7 @@ msgstr ""
"\n"
"Obrigado por se registrar e esperamos que você aproveite o serviço."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6292,18 +6281,18 @@ msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bem vindo(a) a %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Nenhum usuário definido para o modo de usuário único."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7388,26 +7377,26 @@ msgstr ""
"tracking - não implementado ainda\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Não foi encontrado nenhum arquivo de configuração. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Você pode querer executar o instalador para corrigir isto."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -8257,6 +8246,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"A identificação deve conter apenas letras minúsculas e números e não pode "
+"ter e espaços."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Enviar uma mensagem"
@@ -8493,7 +8502,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoga o papel \"%s\" deste usuário"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "O método da API não foi encontrado!"
@@ -8747,64 +8756,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] "um minuto"
-msgstr[1] "%d minutos"
+msgstr[0] "há cerca de um minuto atrás"
+msgstr[1] "há cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "uma hora"
-msgstr[1] "%d horas"
+msgstr[0] "há cerca de uma hora atrás"
+msgstr[1] "há cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "um dia"
-msgstr[1] "%d dias"
+msgstr[0] "há cerca de um dia atrás"
+msgstr[1] "há cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "um mês"
-msgstr[1] "%d meses"
+msgstr[0] "há cerca de um mês atrás"
+msgstr[1] "há cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 59d3e83bd..1d048c36b 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:50+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:20+0000\n"
"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -351,7 +351,7 @@ msgstr "Не удаётся сохранить профиль."
#: actions/designadminpanel.php:125 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
-#, fuzzy, php-format
+#, php-format
msgid ""
"The server was unable to handle that much POST data (%s byte) due to its "
"current configuration."
@@ -362,7 +362,7 @@ msgstr[0] ""
"Сервер не смог обработать столько POST-данных (%s байт) из-за текущей "
"конфигурации."
msgstr[1] ""
-"Сервер не смог обработать столько POST-данных (%s байт) из-за текущей "
+"Сервер не смог обработать столько POST-данных (%s байта) из-за текущей "
"конфигурации."
msgstr[2] ""
"Сервер не смог обработать столько POST-данных (%s байт) из-за текущей "
@@ -391,7 +391,7 @@ msgstr "Не удаётся обновить ваше оформление."
#: actions/apiatomservice.php:85
msgid "Main"
-msgstr ""
+msgstr "Главная"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -452,11 +452,11 @@ msgstr "Отсутствует текст сообщения!"
#. TRANS: Form validation error displayed when message content is too long.
#. TRANS: %d is the maximum number of characters for a message.
#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Maximum message size is %d character."
msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Слишком длинно. Максимальная длина сообщения — %d знаков."
-msgstr[1] "Слишком длинно. Максимальная длина сообщения — %d знаков."
+msgstr[0] "Слишком длинно. Максимальная длина сообщения — %d знак."
+msgstr[1] "Слишком длинно. Максимальная длина сообщения — %d знака."
msgstr[2] "Слишком длинно. Максимальная длина сообщения — %d знаков."
#. TRANS: Client error displayed if a recipient user could not be found (403).
@@ -473,7 +473,6 @@ msgstr ""
#. TRANS: Client error displayed trying to direct message self (403).
#: actions/apidirectmessagenew.php:154
-#, fuzzy
msgid ""
"Do not send a message to yourself; just say it to yourself quietly instead."
msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -533,9 +532,8 @@ msgstr "Вы не можете перестать следовать за соб
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr "Необходимо задать два идентификатора или screen_names."
+msgstr "Необходимо задать два корректных идентификатора или псевдонима."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -547,23 +545,13 @@ msgstr "Не удаётся определить исходного пользо
msgid "Could not find target user."
msgstr "Не удаётся найти целевого пользователя."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -571,9 +559,9 @@ msgstr "Такое имя уже используется. Попробуйте
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Неверное имя."
@@ -582,10 +570,10 @@ msgstr "Неверное имя."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "URL Главной страницы неверен."
@@ -593,12 +581,11 @@ msgstr "URL Главной страницы неверен."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
-#, fuzzy
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
-msgstr "Полное имя слишком длинное (не больше 255 знаков)."
+msgstr "Полное имя слишком длинное (максимум 255 символов)."
#. TRANS: Client error shown when providing too long a description during group creation.
#. TRANS: %d is the maximum number of allowed characters.
@@ -608,26 +595,25 @@ msgstr "Полное имя слишком длинное (не больше 255
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
+#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "Слишком длинное описание (максимум %d символов)"
-msgstr[1] "Слишком длинное описание (максимум %d символов)"
-msgstr[2] "Слишком длинное описание (максимум %d символов)"
+msgstr[0] "Слишком длинное описание (максимум %d символ)."
+msgstr[1] "Слишком длинное описание (максимум %d символа)."
+msgstr[2] "Слишком длинное описание (максимум %d символов)."
#. TRANS: Client error shown when providing too long a location during group creation.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
-#, fuzzy
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
-msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
+msgstr "Слишком длинное месторасположение (максимум 255 символов)."
#. TRANS: Client error shown when providing too many aliases during group creation.
#. TRANS: %d is the maximum number of allowed aliases.
@@ -635,9 +621,9 @@ msgstr "Слишком длинное месторасположение (мак
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
-#, fuzzy, php-format
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
+#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
msgstr[0] "Слишком много алиасов! Максимальное число — %d."
@@ -646,7 +632,7 @@ msgstr[2] "Слишком много алиасов! Максимальное ч
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ошибочный псевдоним: «%s»."
@@ -655,8 +641,8 @@ msgstr "Ошибочный псевдоним: «%s»."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой."
@@ -664,8 +650,8 @@ msgstr "Алиас «%s» уже используется. Попробуйте
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Алиас не может совпадать с именем."
@@ -749,9 +735,8 @@ msgstr "Загрузка не удалась."
#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
#: actions/apioauthaccesstoken.php:101
-#, fuzzy
msgid "Invalid request token or verifier."
-msgstr "Задан неверный ключ для входа."
+msgstr "Недопустимый ключ запроса или верификатор."
#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
#: actions/apioauthauthorize.php:107
@@ -765,9 +750,8 @@ msgstr "Неправильный запрос токена."
#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
#: actions/apioauthauthorize.php:121
-#, fuzzy
msgid "Request token already authorized."
-msgstr "Вы не авторизованы."
+msgstr "Ключ запроса уже авторизован."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
@@ -795,9 +779,8 @@ msgstr "Неверное имя или пароль."
#. TRANS: Server error displayed when a database action fails.
#: actions/apioauthauthorize.php:217
-#, fuzzy
msgid "Database error inserting oauth_token_association."
-msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth."
+msgstr "Ошибка базы данных при вставке oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
@@ -829,16 +812,15 @@ msgstr "Разрешить или запретить доступ"
#. TRANS: User notification of external application requesting account access.
#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
#: actions/apioauthauthorize.php:425
-#, fuzzy, php-format
+#, php-format
msgid ""
"An application would like the ability to <strong>%3$s</strong> your %4$s "
"account data. You should only give access to your %4$s account to third "
"parties you trust."
msgstr ""
-"Приложение <strong>%1$s</strong> от <strong>%2$s</strong> просит разрешение "
-"на<strong>%3$s</strong> данных вашей учётной записи%4$s . Вы должны "
-"предоставлять разрешение на доступ к вашей учётной записи %4$s только тем "
-"сторонним приложениям, которым вы доверяете."
+"Приложение просит разрешение на<strong>%3$s</strong> данных вашей учётной "
+"записи %4$s. Вы должны предоставлять разрешение на доступ к вашей учётной "
+"записи %4$s только тем сторонним приложениям, которым вы доверяете."
#. TRANS: User notification of external application requesting account access.
#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
@@ -865,7 +847,7 @@ msgstr "Аккаунт"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -875,7 +857,7 @@ msgstr "Имя"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
@@ -900,9 +882,8 @@ msgstr "Разрешить"
#. TRANS: Form instructions.
#: actions/apioauthauthorize.php:502
-#, fuzzy
msgid "Authorize access to your account information."
-msgstr "Разрешить или запретить доступ к информации вашей учётной записи."
+msgstr "Разрешить доступ к информации вашей учётной записи."
#. TRANS: Header for user notification after revoking OAuth access to an application.
#: actions/apioauthauthorize.php:594
@@ -912,15 +893,14 @@ msgstr "Авторизация отменена."
#. TRANS: User notification after revoking OAuth access to an application.
#. TRANS: %s is an OAuth token.
#: actions/apioauthauthorize.php:598
-#, fuzzy, php-format
+#, php-format
msgid "The request token %s has been revoked."
-msgstr "Ключ запроса %s был запрещён и аннулирован."
+msgstr "Ключ запроса %s отозван."
#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:621
-#, fuzzy
msgid "You have successfully authorized the application"
-msgstr "Вы успешно авторизованы %s."
+msgstr "Приложение успешно авторизовано"
#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:625
@@ -928,13 +908,15 @@ msgid ""
"Please return to the application and enter the following security code to "
"complete the process."
msgstr ""
+"Пожалуйста, вернитесь в приложение и введите следующий код безопасности, "
+"чтобы завершить процесс."
#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
#: actions/apioauthauthorize.php:632
-#, fuzzy, php-format
+#, php-format
msgid "You have successfully authorized %s"
-msgstr "Вы успешно авторизованы %s."
+msgstr "Вы успешно авторизовали %s"
#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
@@ -944,6 +926,8 @@ msgid ""
"Please return to %s and enter the following security code to complete the "
"process."
msgstr ""
+"Пожалуйста, вернитесь в %s и введите следующий код безопасности для "
+"завершения процесса."
#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
#. TRANS: POST and DELETE should not be translated.
@@ -977,14 +961,13 @@ msgid "Already repeated that notice."
msgstr "Запись уже повторена."
#: actions/apistatusesshow.php:117
-#, fuzzy
msgid "HTTP method not supported."
-msgstr "Метод API не найден."
+msgstr "HTTP-метод не поддерживается."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Неподдерживаемый формат."
+msgstr "Неподдерживаемый формат: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -998,7 +981,7 @@ msgstr "Не найдено статуса с таким ID."
#: actions/apistatusesshow.php:227
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Можно удалить только в формате Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
@@ -1006,9 +989,9 @@ msgid "Can't delete this notice."
msgstr "Не удаётся удалить эту запись."
#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#, php-format
msgid "Deleted notice %d"
-msgstr "Удалить запись"
+msgstr "Запись %d удалена"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1019,27 +1002,26 @@ msgstr "Клиент должен предоставить параметр «st
#. TRANS: %d is the maximum number of character for a notice.
#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
#: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Maximum notice size is %d character."
msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Слишком длинная запись. Максимальная длина — %d знаков."
-msgstr[1] "Слишком длинная запись. Максимальная длина — %d знаков."
+msgstr[0] "Слишком длинная запись. Максимальная длина — %d знак."
+msgstr[1] "Слишком длинная запись. Максимальная длина — %d знака."
msgstr[2] "Слишком длинная запись. Максимальная длина — %d знаков."
#. TRANS: Client error displayed when replying to a non-existing notice.
#: actions/apistatusesupdate.php:284
-#, fuzzy
msgid "Parent notice not found."
-msgstr "Метод API не найден."
+msgstr "Родительская запись не найдена."
#. TRANS: Client error displayed exceeding the maximum notice length.
#. TRANS: %d is the maximum lenth for a notice.
#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Maximum notice size is %d character, including attachment URL."
msgid_plural "Maximum notice size is %d characters, including attachment URL."
-msgstr[0] "Максимальная длина записи — %d символов, включая URL вложения."
-msgstr[1] "Максимальная длина записи — %d символов, включая URL вложения."
+msgstr[0] "Максимальная длина записи — %d символ, включая URL вложения."
+msgstr[1] "Максимальная длина записи — %d символа, включая URL вложения."
msgstr[2] "Максимальная длина записи — %d символов, включая URL вложения."
#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
@@ -1059,16 +1041,16 @@ msgstr "%1$s / Любимое от %2$s"
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
#. TRANS: %3$s is a user nickname.
#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s."
+msgstr "Обновления %1$s, отмеченные как любимые %2$s / %3$s."
#. TRANS: Server error displayed when generating an Atom feed fails.
#. TRANS: %s is the error.
#: actions/apitimelinegroup.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not generate feed for group - %s"
-msgstr "Не удаётся обновить информацию о группе."
+msgstr "Не удаётся сгенерировать информацию о группе: %s"
#. TRANS: Title for timeline of most recent mentions of a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1099,7 +1081,6 @@ msgstr "Обновления %s от всех!"
#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
#: actions/apitimelineretweetedbyme.php:71
-#, fuzzy
msgid "Unimplemented."
msgstr "Нереализованный метод."
@@ -1131,36 +1112,35 @@ msgid "Updates tagged with %1$s on %2$s!"
msgstr "Обновления с тегом %1$s на %2$s!"
#: actions/apitimelineuser.php:300
-#, fuzzy
msgid "Only the user can add to their own timeline."
-msgstr "Только сам пользователь может читать собственный почтовый ящик."
+msgstr "Только пользователь может добавлять в свою ленту."
#: actions/apitimelineuser.php:306
msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+msgstr "Принимать только AtomPub для atom-каналов."
#: actions/apitimelineuser.php:316
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "POST-запрос Atom должен быть объектом Atom."
#: actions/apitimelineuser.php:325
msgid "Can only handle post activities."
-msgstr ""
+msgstr "Возможна обработка только POST-запросов."
#: actions/apitimelineuser.php:334
#, php-format
msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+msgstr "Невозможно обработать действия объекта типа «%s»"
#: actions/apitimelineuser.php:392
-#, fuzzy, php-format
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Записи с таким id не существует."
+msgstr "Запись с URI «%s» уже существует."
#: actions/apitimelineuser.php:423
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Запись AtomPub с неизвестным целевым URI %s"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1244,21 +1224,18 @@ msgstr "Просмотр"
#. TRANS: Button on avatar upload page to delete current avatar.
#: actions/avatarsettings.php:155
-#, fuzzy
msgctxt "BUTTON"
msgid "Delete"
msgstr "Удалить"
#. TRANS: Button on avatar upload page to upload an avatar.
#: actions/avatarsettings.php:173
-#, fuzzy
msgctxt "BUTTON"
msgid "Upload"
msgstr "Загрузить"
#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
#: actions/avatarsettings.php:243
-#, fuzzy
msgctxt "BUTTON"
msgid "Crop"
msgstr "Обрезать"
@@ -1409,7 +1386,6 @@ msgstr "Разблокировать пользователя в группе."
#. TRANS: Button text for unblocking a user from a group.
#: actions/blockedfromgroup.php:323
-#, fuzzy
msgctxt "BUTTON"
msgid "Unblock"
msgstr "Разблокировать"
@@ -1473,9 +1449,8 @@ msgstr "Не удаётся обновить пользователя."
#. TRANS: Server error displayed when an address confirmation code deletion from the
#. TRANS: database fails in the contact address confirmation action.
#: actions/confirmaddress.php:132
-#, fuzzy
msgid "Could not delete address confirmation."
-msgstr "Не удаётся удалить подверждение IM."
+msgstr "Не удаётся удалить подверждение адреса."
#. TRANS: Title for the contact address confirmation action.
#: actions/confirmaddress.php:150
@@ -1553,9 +1528,8 @@ msgstr "Удалить это приложение"
#. TRANS: Client error when trying to delete group while not logged in.
#: actions/deletegroup.php:64
-#, fuzzy
msgid "You must be logged in to delete a group."
-msgstr "Вы должны авторизоваться, чтобы покинуть группу."
+msgstr "Вы должны авторизоваться, чтобы удалить группу."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
#: actions/deletegroup.php:94 actions/joingroup.php:88
@@ -1565,41 +1539,39 @@ msgstr "Нет имени или ID."
#. TRANS: Client error when trying to delete a group without having the rights to delete it.
#: actions/deletegroup.php:107
-#, fuzzy
msgid "You are not allowed to delete this group."
-msgstr "Вы не являетесь членом этой группы."
+msgstr "Вы не можете удалить эту группу."
#. TRANS: Server error displayed if a group could not be deleted.
#. TRANS: %s is the name of the group that could not be deleted.
#: actions/deletegroup.php:150
-#, fuzzy, php-format
+#, php-format
msgid "Could not delete group %s."
-msgstr "Не удаётся обновить информацию о группе."
+msgstr "Не удаётся удалить группу %s."
#. TRANS: Message given after deleting a group.
#. TRANS: %s is the deleted group's name.
#: actions/deletegroup.php:159
-#, fuzzy, php-format
+#, php-format
msgid "Deleted group %s"
-msgstr "%1$s покинул группу %2$s"
+msgstr "Группа %s удалена"
#. TRANS: Title of delete group page.
#. TRANS: Form legend for deleting a group.
#: actions/deletegroup.php:176 actions/deletegroup.php:202
-#, fuzzy
msgid "Delete group"
-msgstr "Удалить пользователя"
+msgstr "Удалить группу"
#. TRANS: Warning in form for deleleting a group.
#: actions/deletegroup.php:206
-#, fuzzy
msgid ""
"Are you sure you want to delete this group? This will clear all data about "
"the group from the database, without a backup. Public posts to this group "
"will still appear in individual timelines."
msgstr ""
-"Вы действительно хотите удалить этого пользователя? Это повлечёт удаление "
-"всех данных о пользователе из базы данных без возможности восстановления."
+"Вы действительно хотите удалить эту группу? Это повлечёт удаление всех "
+"данных о группе из базы данных без возможности восстановления. Открытые "
+"записи в этой группе по прежнему останутся в личных лентах."
#. TRANS: Submit button title for 'No' when deleting a group.
#: actions/deletegroup.php:224
@@ -1688,16 +1660,15 @@ msgstr "Оформление"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "Настройки оформления для этого сайта StatusNet"
#: actions/designadminpanel.php:335
msgid "Invalid logo URL."
msgstr "Неверный URL логотипа."
#: actions/designadminpanel.php:340
-#, fuzzy
msgid "Invalid SSL logo URL."
-msgstr "Неверный URL логотипа."
+msgstr "Неверный URL логотипа SSL."
#: actions/designadminpanel.php:344
#, php-format
@@ -1713,9 +1684,8 @@ msgid "Site logo"
msgstr "Логотип сайта"
#: actions/designadminpanel.php:457
-#, fuzzy
msgid "SSL logo"
-msgstr "Логотип сайта"
+msgstr "Логотип SSL"
#: actions/designadminpanel.php:469
msgid "Change theme"
@@ -1880,9 +1850,8 @@ msgstr "Имя обязательно."
#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
#: actions/editapplication.php:188 actions/newapplication.php:169
-#, fuzzy
msgid "Name is too long (maximum 255 characters)."
-msgstr "Имя слишком длинное (не больше 255 знаков)."
+msgstr "Слишком длинное имя (максимум 255 символов)."
#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
#: actions/editapplication.php:192 actions/newapplication.php:166
@@ -1911,9 +1880,8 @@ msgstr "Организация обязательна."
#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
#: actions/editapplication.php:223 actions/newapplication.php:199
-#, fuzzy
msgid "Organization is too long (maximum 255 characters)."
-msgstr "Слишком длинное название организации (максимум 255 знаков)."
+msgstr "Слишком длинное название организации (максимум 255 символов)."
#: actions/editapplication.php:226 actions/newapplication.php:202
msgid "Organization homepage is required."
@@ -1959,24 +1927,24 @@ msgstr "Заполните информацию о группе в следую
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Неверный алиас: «%s»"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Не удаётся обновить информацию о группе."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Не удаётся создать алиасы."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Настройки сохранены."
@@ -2132,7 +2100,7 @@ msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неверный электронный адрес."
@@ -2816,9 +2784,8 @@ msgstr "Неправильный адрес электронной почты: %
#. TRANS: Page title when invitations have been sent.
#: actions/invite.php:116
-#, fuzzy
msgid "Invitations sent"
-msgstr "Приглашение(я) отослано(ы)"
+msgstr "Приглашения отправлены"
#. TRANS: Page title when inviting potential users.
#: actions/invite.php:119
@@ -2830,17 +2797,16 @@ msgstr "Пригласить новых пользователей"
#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
#. TRANS: Followed by a bullet list.
#: actions/invite.php:139
-#, fuzzy
msgid "You are already subscribed to this user:"
msgid_plural "You are already subscribed to these users:"
-msgstr[0] "Вы уже подписаны на пользователя:"
-msgstr[1] "Вы уже подписаны на пользователя:"
-msgstr[2] "Вы уже подписаны на пользователя:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
#: actions/invite.php:145 actions/invite.php:159
-#, fuzzy, php-format
+#, php-format
msgctxt "INVITE"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2849,30 +2815,28 @@ msgstr "%1$s (%2$s)"
#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
#. TRANS: reported already present people. Followed by a bullet list.
#: actions/invite.php:153
-#, fuzzy
msgid "This person is already a user and you were automatically subscribed:"
msgid_plural ""
"These people are already users and you were automatically subscribed to them:"
msgstr[0] ""
-"Это люди, которые уже являются пользователями, и на которых Вы подписались "
+"Это люди, которые уже являются пользователями, и на которых вы подписались "
"автоматически:"
msgstr[1] ""
-"Это люди, которые уже являются пользователями, и на которых Вы подписались "
+"Это люди, которые уже являются пользователями, и на которых вы подписались "
"автоматически:"
msgstr[2] ""
-"Это люди, которые уже являются пользователями, и на которых Вы подписались "
+"Это люди, которые уже являются пользователями, и на которых вы подписались "
"автоматически:"
#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
#. TRANS: based on the number of invitations sent. Followed by a bullet list of
#. TRANS: e-mail addresses to which invitations were sent.
#: actions/invite.php:167
-#, fuzzy
msgid "Invitation sent to the following person:"
msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Приглашение(я) отослано(ы) следующим адресатам:"
-msgstr[1] "Приглашение(я) отослано(ы) следующим адресатам:"
-msgstr[2] "Приглашение(я) отослано(ы) следующим адресатам:"
+msgstr[0] "Приглашение отправлено следующему адресату:"
+msgstr[1] "Приглашения отправлены следующим адресатам:"
+msgstr[2] ""
#. TRANS: Generic message displayed after sending out one or more invitations to
#. TRANS: people to join a StatusNet site.
@@ -3017,7 +2981,7 @@ msgstr "Лицензия"
#: actions/licenseadminpanel.php:67
msgid "License for this StatusNet site"
-msgstr ""
+msgstr "Лицензия этого сайта StatusNet"
#: actions/licenseadminpanel.php:139
msgid "Invalid license selection."
@@ -3028,31 +2992,32 @@ msgid ""
"You must specify the owner of the content when using the All Rights Reserved "
"license."
msgstr ""
+"Вы должны указать владельца содержания при использовании лицензии «Все права "
+"защищены»."
#: actions/licenseadminpanel.php:156
-#, fuzzy
msgid "Invalid license title. Maximum length is 255 characters."
msgstr "Неверное название лицензии. Максимальная длина 255 символов."
#: actions/licenseadminpanel.php:168
msgid "Invalid license URL."
-msgstr ""
+msgstr "Неверный URL лицензии."
#: actions/licenseadminpanel.php:171
msgid "Invalid license image URL."
-msgstr ""
+msgstr "Неверный URL изображения лицензии."
#: actions/licenseadminpanel.php:179
msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "URL лицензии должен быть пустым или действительным URL."
#: actions/licenseadminpanel.php:187
msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "Изображение лицензии должно быть пустым или действительным URL."
#: actions/licenseadminpanel.php:239
msgid "License selection"
-msgstr ""
+msgstr "Выбор лицензии"
#: actions/licenseadminpanel.php:245
msgid "Private"
@@ -3064,7 +3029,7 @@ msgstr "Все права защищены"
#: actions/licenseadminpanel.php:247
msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
#: actions/licenseadminpanel.php:252
msgid "Type"
@@ -3076,7 +3041,7 @@ msgstr "Выбор лицензии"
#: actions/licenseadminpanel.php:268
msgid "License details"
-msgstr ""
+msgstr "Подробности лицензии"
#: actions/licenseadminpanel.php:274
msgid "Owner"
@@ -3084,7 +3049,7 @@ msgstr "Владелец"
#: actions/licenseadminpanel.php:275
msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "Имя владельца содержимого сайта (если применимо)."
#: actions/licenseadminpanel.php:283
msgid "License Title"
@@ -3092,7 +3057,7 @@ msgstr "Название лицензии"
#: actions/licenseadminpanel.php:284
msgid "The title of the license."
-msgstr ""
+msgstr "Название лицензии."
#: actions/licenseadminpanel.php:292
msgid "License URL"
@@ -3104,11 +3069,11 @@ msgstr "URL-адрес для получения дополнительной и
#: actions/licenseadminpanel.php:300
msgid "License Image URL"
-msgstr ""
+msgstr "URL изображения лицензии"
#: actions/licenseadminpanel.php:301
msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "URL изображения, отображаемого вместе с лицензией."
#: actions/licenseadminpanel.php:319
msgid "Save license settings"
@@ -3134,11 +3099,11 @@ msgstr "Вход"
msgid "Login to site"
msgstr "Авторизоваться"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Запомнить меня"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
@@ -3318,13 +3283,12 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Все обновления, соответствующие поисковому запросу «%s»"
#: actions/nudge.php:85
-#, fuzzy
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set their email "
"address yet."
msgstr ""
-"Этот пользователь не разрешает «подталкивать» его или ещё не указал свой "
-"email-адрес."
+"Этот пользователь не разрешает «подталкивать» его или ещё не подтвердил или "
+"не указал свой email-адрес."
#: actions/nudge.php:94
msgid "Nudge sent"
@@ -3363,7 +3327,7 @@ msgstr "Подключённые приложения"
#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
msgid "The following connections exist for your account."
-msgstr ""
+msgstr "Следующие приложения подключены к вашей учётной записи."
#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
#: actions/oauthconnectionssettings.php:168
@@ -3373,7 +3337,7 @@ msgstr "Вы не являетесь пользователем этого пр
#. TRANS: Client error when revoking access has failed for some reason.
#. TRANS: %s is the application ID revoking access failed for.
#: actions/oauthconnectionssettings.php:183
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for application: %s."
msgstr "Не удаётся отозвать доступ для приложения: %s."
@@ -3385,6 +3349,7 @@ msgid ""
"You have successfully revoked access for %1$s and the access token starting "
"with %2$s."
msgstr ""
+"Доступ для %1$s и ключ доступа, начинающийся на %2$s, успешно отозваны."
#. TRANS: Empty list message when no applications have been authorised yet.
#: actions/oauthconnectionssettings.php:213
@@ -3400,6 +3365,8 @@ msgid ""
"Are you a developer? [Register an OAuth client application](%s) to use with "
"this instance of StatusNet."
msgstr ""
+"Вы разработчик? [Зарегистрируйте клиентское приложение OAuth](%s) для "
+"использования с этим сайтом StatusNet."
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
@@ -3474,7 +3441,6 @@ msgstr "Показать или скрыть оформления профиля
#. TRANS: Form validation error for form "Other settings" in user profile.
#: actions/othersettings.php:162
-#, fuzzy
msgid "URL shortening service is too long (maximum 50 characters)."
msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
@@ -3539,7 +3505,7 @@ msgid "6 or more characters"
msgstr "6 или больше знаков"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Подтверждение"
@@ -3551,11 +3517,11 @@ msgstr "Тот же пароль, что и выше"
msgid "Change"
msgstr "Изменить"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Пароль должен быть длиной не менее 6 символов."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Пароли не совпадают."
@@ -3584,7 +3550,7 @@ msgstr "Пути"
#. TRANS: Form instructions for Path admin panel.
#: actions/pathsadminpanel.php:69
msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "Настройки пути и сервера для этого сайта StatusNet"
#. TRANS: Client error in Paths admin panel.
#. TRANS: %s is the directory that could not be read from.
@@ -3647,12 +3613,10 @@ msgstr "Путь к сайту."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:255
-#, fuzzy
msgid "Locale directory"
-msgstr "Директория темы"
+msgstr "Директория локализации"
#: actions/pathsadminpanel.php:256
-#, fuzzy
msgid "Directory path to locales."
msgstr "Путь к директории локализаций"
@@ -3671,14 +3635,13 @@ msgstr "Тема"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:281
-#, fuzzy
msgid "Server for themes."
-msgstr "Тема для сайта."
+msgstr "Сервер для тем."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:290
msgid "Web path to themes."
-msgstr ""
+msgstr "Веб-путь к темам."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
@@ -3689,19 +3652,18 @@ msgstr "SSL-сервер"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:299
msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "SSL-сервер для темы (по умолчанию: SSL-сервер)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
#: actions/pathsadminpanel.php:452
-#, fuzzy
msgid "SSL path"
-msgstr "Путь к сайту"
+msgstr "SSL-путь"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:308
msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "SSL-путь к темам (по умолчанию: /theme/)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
@@ -3711,9 +3673,8 @@ msgstr "Директория"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:317
-#, fuzzy
msgid "Directory where themes are located."
-msgstr "Путь к директории локализаций"
+msgstr "Директория, в которой расположены темы."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:326
@@ -3727,9 +3688,8 @@ msgstr "Сервер аватар"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "Server for avatars."
-msgstr "Тема для сайта."
+msgstr "Сервер для аватаров."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:342
@@ -3748,9 +3708,8 @@ msgstr "Директория аватар"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:353
-#, fuzzy
msgid "Directory where avatars are located."
-msgstr "Путь к директории локализаций"
+msgstr "Директория, в которой расположены аватары."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:364
@@ -3759,30 +3718,28 @@ msgstr "Фоновые изображения"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:372
-#, fuzzy
msgid "Server for backgrounds."
-msgstr "Тема для сайта."
+msgstr "Сервер для фоновых изображений."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:381
msgid "Web path to backgrounds."
-msgstr ""
+msgstr "Веб-путь к фоновым изображениям."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:390
msgid "Server for backgrounds on SSL pages."
-msgstr ""
+msgstr "Сервер для фоновых изображений на страницах SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:399
msgid "Web path to backgrounds on SSL pages."
-msgstr ""
+msgstr "Веб-путь к фоновым изображениям для SSL-страниц."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:408
-#, fuzzy
msgid "Directory where backgrounds are located."
-msgstr "Путь к директории локализаций"
+msgstr "Директория, в которой расположены фоновые изображения."
#. TRANS: Fieldset legens in Paths admin panel.
#. TRANS: DT element label in attachment list.
@@ -3797,26 +3754,23 @@ msgstr "Сервер для вложений."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:436
-#, fuzzy
msgid "Web path to attachments."
-msgstr "Нет вложений."
+msgstr "Веб-путь к вложениям."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:445
-#, fuzzy
msgid "Server for attachments on SSL pages."
-msgstr "Тема для сайта."
+msgstr "Сервер для вложений на SSL-страницах."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:454
msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Веб-путь к вложениям на SSL-страницах."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:463
-#, fuzzy
msgid "Directory where attachments are located."
-msgstr "Путь к директории локализаций"
+msgstr "Директория, в которой расположены вложения."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:472
@@ -3844,15 +3798,13 @@ msgstr "Использовать SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:487
-#, fuzzy
msgid "When to use SSL."
-msgstr "Когда использовать SSL"
+msgstr "Когда использовать SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:497
-#, fuzzy
msgid "Server to direct SSL requests to."
-msgstr "Сервер, которому направлять SSL-запросы"
+msgstr "Сервер, которому направлять SSL-запросы."
#. TRANS: Button title text to store form data in the Paths admin panel.
#: actions/pathsadminpanel.php:514
@@ -3911,13 +3863,13 @@ msgstr "Информация профиля"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:113
-#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
+msgstr ""
+"1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3925,42 +3877,41 @@ msgstr "Полное имя"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Главная"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:125
-#, fuzzy
msgid "URL of your homepage, blog, or profile on another site."
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
+msgstr "Адрес вашей домашней страницы, блога или профиля на другом сайте."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
-#, fuzzy, php-format
+#: actions/profilesettings.php:133 actions/register.php:472
+#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
-msgstr[0] "Опишите себя и свои увлечения при помощи %d символов"
+msgstr[0] "Опишите себя и свои увлечения при помощи %d символа"
msgstr[1] "Опишите себя и свои увлечения при помощи %d символов"
msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Опишите себя и свои интересы"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Биография"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3968,7 +3919,7 @@ msgid "Location"
msgstr "Месторасположение"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Где вы находитесь, например «Город, область, страна»"
@@ -4021,12 +3972,12 @@ msgstr "Автоматически подписываться на всех, к
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
-#, fuzzy, php-format
+#: actions/profilesettings.php:262 actions/register.php:229
+#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "Слишком длинная биография (максимум %d символов)."
-msgstr[1] "Слишком длинная биография (максимум %d символов)."
+msgstr[0] "Слишком длинная биография (максимум %d символ)."
+msgstr[1] "Слишком длинная биография (максимум %d символа)."
msgstr[2] "Слишком длинная биография (максимум %d символов)."
#. TRANS: Validation error in form for profile settings.
@@ -4036,9 +3987,8 @@ msgstr "Часовой пояс не выбран."
#. TRANS: Validation error in form for profile settings.
#: actions/profilesettings.php:281
-#, fuzzy
msgid "Language is too long (maximum 50 characters)."
-msgstr "Слишком длинный язык (не может быть более 50 символов)."
+msgstr "Слишком длинный язык (максимум 50 символов)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
@@ -4156,9 +4106,9 @@ msgstr "Общее облако тегов"
#. TRANS: Instructions (more used like an explanation/header).
#. TRANS: %s is the StatusNet sitename.
#: actions/publictagcloud.php:65
-#, fuzzy, php-format
+#, php-format
msgid "These are most popular recent tags on %s"
-msgstr "Самые популярные теги на %s на данный момент "
+msgstr "Самые популярные недавние теги на %s"
#. TRANS: This message contains a Markdown URL. The link description is between
#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4301,7 +4251,6 @@ msgid "Unexpected password reset."
msgstr "Нетиповая переустановка пароля."
#: actions/recoverpassword.php:365
-#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "Пароль должен быть длиной не менее 6 символов."
@@ -4309,7 +4258,7 @@ msgstr "Пароль должен быть длиной не менее 6 сим
msgid "Password and confirmation do not match."
msgstr "Пароль и его подтверждение не совпадают."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Ошибка в установках пользователя."
@@ -4317,7 +4266,7 @@ msgstr "Ошибка в установках пользователя."
msgid "New password successfully saved. You are now logged in."
msgstr "Новый пароль успешно сохранён. Вы авторизовались."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Простите, регистрация только по приглашению."
@@ -4329,7 +4278,7 @@ msgstr "Извините, неверный пригласительный код
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -4337,21 +4286,21 @@ msgstr "Регистрация"
msgid "Registration not allowed."
msgstr "Регистрация недопустима."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr ""
"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
"соглашения."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Такой электронный адрес уже задействован."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Неверное имя или пароль."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4360,38 +4309,38 @@ msgstr ""
"получите возможность публиковать короткие сообщения и устанавливать связи с "
"друзьями и коллегами. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 или более символов. Обязательное поле."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Тот же пароль что и сверху. Обязательное поле."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Полное имя, предпочтительно Ваше настоящее имя"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
@@ -4399,23 +4348,23 @@ msgstr ""
"Я понимаю, что содержание и данные %1$s являются частными и "
"конфиденциальными."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторским правом на мои тексты и файлы обладает %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Все права защищены."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4424,7 +4373,7 @@ msgstr ""
"Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
"информации: пароля, почтового адреса, номера мессенджера и номера телефона."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4458,7 +4407,7 @@ msgstr ""
"Спасибо за то, что присоединились к нам, надеемся, что вы получите "
"удовольствие от использования данного сервиса!"
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -4632,7 +4581,7 @@ msgstr "Сессии"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "Настройки сессии для этого сайта StatusNet"
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -4884,14 +4833,12 @@ msgstr "Все участники"
#. TRANS: Label for creation date in statistics on group page.
#: actions/showgroup.php:453
-#, fuzzy
msgctxt "LABEL"
msgid "Created"
-msgstr "Создано"
+msgstr "Дата создания"
#. TRANS: Label for member count in statistics on group page.
#: actions/showgroup.php:461
-#, fuzzy
msgctxt "LABEL"
msgid "Members"
msgstr "Участники"
@@ -4967,16 +4914,16 @@ msgstr "Запись удалена."
#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
#: actions/showstream.php:70
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s"
-msgstr "%1$s, страница %2$d"
+msgstr "%1$s с тегом %2$s"
#. TRANS: Page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
#: actions/showstream.php:74
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s, page %3$d"
-msgstr "Записи с тегом %1$s, страница %2$d"
+msgstr "%1$s с тегом %2$s, страница %3$d"
#. TRANS: Extended page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$d is the page number.
@@ -5020,9 +4967,9 @@ msgstr "FOAF для %s"
#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
#: actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr "Это лента %1$s, однако %2$s пока ничего не отправил."
+msgstr "Это лента %1$s, однако %1$s пока ничего не отправил."
#. TRANS: Second sentence of empty list message for a stream for the user themselves.
#: actions/showstream.php:217
@@ -5207,7 +5154,6 @@ msgstr "Не удаётся сохранить уведомление сайта
#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
#: actions/sitenoticeadminpanel.php:112
-#, fuzzy
msgid "Maximum length for the site-wide notice is 255 characters."
msgstr "Максимальная длина уведомления сайта составляет 255 символов."
@@ -5218,7 +5164,6 @@ msgstr "Текст уведомления сайта"
#. TRANS: Tooltip for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:179
-#, fuzzy
msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
msgstr "Текст уведомления сайта (максимум 255 символов; допустим HTML)"
@@ -5499,13 +5444,12 @@ msgstr "Эти пользователи читают записи %s."
#. TRANS: Subscriber list text when the logged in user has no subscribers.
#: actions/subscribers.php:116
-#, fuzzy
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor."
msgstr ""
"У вас нет подписчиков. Попробуйте подписаться на знакомых людей, и они могут "
-"ответить взаимностью"
+"ответить взаимностью."
#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -5700,7 +5644,7 @@ msgstr "Пользователь"
#. TRANS: Instruction for user admin panel.
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "Пользовательские настройки для этого сайта StatusNet"
#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
#: actions/useradminpanel.php:147
@@ -5709,7 +5653,6 @@ msgstr "Неверное ограничение биографии. Должно
#. TRANS: Form validation error in user admin panel when welcome text is too long.
#: actions/useradminpanel.php:154
-#, fuzzy
msgid "Invalid welcome text. Maximum length is 255 characters."
msgstr ""
"Неверный текст приветствия. Максимальная длина составляет 255 символов."
@@ -5717,7 +5660,7 @@ msgstr ""
#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
@@ -5749,7 +5692,6 @@ msgstr "Приветствие новым пользователям"
#. TRANS: Tooltip in user admin panel for setting new user welcome text.
#: actions/useradminpanel.php:238
-#, fuzzy
msgid "Welcome text for new users (maximum 255 characters)."
msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
@@ -5781,7 +5723,7 @@ msgstr "Разрешать ли пользователям приглашать
#. TRANS: Title for button to save user settings in user admin panel.
#: actions/useradminpanel.php:302
msgid "Save user settings"
-msgstr ""
+msgstr "Сохранить пользовательские настройки"
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -6007,9 +5949,9 @@ msgstr "Пометить"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
#: classes/Fave.php:151
-#, fuzzy, php-format
+#, php-format
msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) добавил вашу запись в число своих любимых"
+msgstr "%1$s добавил запись %2$s в число любимых."
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:156
@@ -6026,7 +5968,7 @@ msgstr "Робин считает, что это невозможно."
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
#. TRANS: %1$s is used for plural.
#: classes/File.php:204
-#, fuzzy, php-format
+#, php-format
msgid ""
"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
@@ -6046,25 +5988,23 @@ msgstr[2] ""
#. TRANS: Message given if an upload would exceed user quota.
#. TRANS: %d (number) is the user quota in bytes and is used for plural.
#: classes/File.php:217
-#, fuzzy, php-format
+#, php-format
msgid "A file this large would exceed your user quota of %d byte."
msgid_plural "A file this large would exceed your user quota of %d bytes."
-msgstr[0] ""
-"Файл такого размера превысит вашу пользовательскую квоту в %d байта."
+msgstr[0] "Файл такого размера превысит вашу пользовательскую квоту в %d байт."
msgstr[1] ""
"Файл такого размера превысит вашу пользовательскую квоту в %d байта."
-msgstr[2] ""
-"Файл такого размера превысит вашу пользовательскую квоту в %d байта."
+msgstr[2] "Файл такого размера превысит вашу пользовательскую квоту в %d байт."
#. TRANS: Message given id an upload would exceed a user's monthly quota.
#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
#: classes/File.php:229
-#, fuzzy, php-format
+#, php-format
msgid "A file this large would exceed your monthly quota of %d byte."
msgid_plural "A file this large would exceed your monthly quota of %d bytes."
-msgstr[0] "Файл такого размера превысит вашу месячную квоту в %d байта."
+msgstr[0] "Файл такого размера превысит вашу месячную квоту в %d байт."
msgstr[1] "Файл такого размера превысит вашу месячную квоту в %d байта."
-msgstr[2] "Файл такого размера превысит вашу месячную квоту в %d байта."
+msgstr[2] "Файл такого размера превысит вашу месячную квоту в %d байт."
#. TRANS: Client exception thrown if a file upload does not have a valid name.
#: classes/File.php:276 classes/File.php:291
@@ -6091,14 +6031,14 @@ msgstr "Не удаётся покинуть группу."
#: classes/Group_member.php:76
#, php-format
msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "Неверный идентификатор профиля %s."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
#: classes/Group_member.php:89
-#, fuzzy, php-format
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Ошибка сохранения пользователя; неверное имя."
+msgstr "Неверный идентификатор группы %s."
#. TRANS: Activity title.
#: classes/Group_member.php:113 lib/joinform.php:114
@@ -6110,7 +6050,7 @@ msgstr "Присоединиться"
#: classes/Group_member.php:117
#, php-format
msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s присоединился к группе %2$s."
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
@@ -6197,9 +6137,8 @@ msgstr "Проблемы с сохранением записи."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
#: classes/Notice.php:909
-#, fuzzy
msgid "Bad type provided to saveKnownGroups."
-msgstr "Для saveKnownGroups указан неверный тип"
+msgstr "Для saveKnownGroups указан неверный тип."
#. TRANS: Server exception thrown when an update for a group inbox fails.
#: classes/Notice.php:1008
@@ -6209,9 +6148,9 @@ msgstr "Проблемы с сохранением входящих сообще
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
#: classes/Notice.php:1122
-#, fuzzy, php-format
+#, php-format
msgid "Could not save reply for %1$d, %2$d."
-msgstr "Не удаётся сохранить информацию о локальной группе."
+msgstr "Не удаётся сохранить ответ для %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
@@ -6222,7 +6161,7 @@ msgstr "RT @%1$s %2$s"
#. TRANS: Full name of a profile or group followed by nickname in parens
#: classes/Profile.php:172 classes/User_group.php:247
-#, fuzzy, php-format
+#, php-format
msgctxt "FANCYNAME"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -6292,31 +6231,31 @@ msgstr "Не удаётся удалить подписку."
#. TRANS: Activity tile when subscribing to another person.
#: classes/Subscription.php:255
msgid "Follow"
-msgstr ""
+msgstr "Следить"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
#: classes/Subscription.php:258
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is now following %2$s."
-msgstr "%1$s теперь следит за вашими записями на %2$s."
+msgstr "%1$s теперь следит за %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Ни задан пользователь для однопользовательского режима."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
-msgstr ""
+msgstr "Вызов отключённого кода однопользовательского режима."
#. TRANS: Server exception thrown when creating a group failed.
#: classes/User_group.php:511
@@ -6388,7 +6327,7 @@ msgstr "Страница без названия"
#: lib/action.php:312
msgctxt "TOOLTIP"
msgid "Show more"
-msgstr ""
+msgstr "Показать ещё"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
#: lib/action.php:531
@@ -6775,7 +6714,7 @@ msgstr "Конфигурация снимков"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:401
msgid "Set site license"
-msgstr ""
+msgstr "Установить лицензию сайта"
#. TRANS: Client error 401.
#: lib/apiauth.php:111
@@ -6807,27 +6746,24 @@ msgstr "Не удаётся произвести аутентификацию."
#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
#: lib/apioauthstore.php:45
-#, fuzzy
msgid "Could not create anonymous consumer."
-msgstr "Не удаётся создать алиасы."
+msgstr "Не удаётся создать анонимного пользователя OAuth."
#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
#: lib/apioauthstore.php:69
-#, fuzzy
msgid "Could not create anonymous OAuth application."
-msgstr "Не удаётся создать приложение."
+msgstr "Не удаётся создать анонимное OAuth-приложение."
#. TRANS: Exception thrown when no token association could be found.
#: lib/apioauthstore.php:151
msgid ""
"Could not find a profile and application associated with the request token."
-msgstr ""
+msgstr "Не удаётся найти профиль и приложение, связанное с ключом запроса."
#. TRANS: Exception thrown when no access token can be issued.
#: lib/apioauthstore.php:186
-#, fuzzy
msgid "Could not issue access token."
-msgstr "Не удаётся вставить сообщение."
+msgstr "Ошибка выдачи ключа доступа."
#. TRANS: Server error displayed when a database error occurs.
#: lib/apioauthstore.php:243
@@ -6852,10 +6788,10 @@ msgstr "Иконка для этого приложения"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Опишите ваше приложение при помощи %d символов"
+msgstr[0] "Опишите ваше приложение при помощи %d символа"
msgstr[1] "Опишите ваше приложение при помощи %d символов"
msgstr[2] "Опишите ваше приложение при помощи %d символов"
@@ -6927,7 +6863,7 @@ msgstr "Отменить"
#: lib/applicationlist.php:247
msgid " by "
-msgstr ""
+msgstr " от "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -6950,7 +6886,7 @@ msgstr "Подтверждён доступ %1$s — «%2$s»."
#: lib/applicationlist.php:282
#, php-format
msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Ключ доступа, начинающийся на %s"
#. TRANS: Button label
#: lib/applicationlist.php:298
@@ -6960,7 +6896,7 @@ msgstr "Отозвать"
#: lib/atom10feed.php:112
msgid "author element must contain a name element."
-msgstr ""
+msgstr "Элемент author должен содержать элемент name."
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:294
@@ -6984,15 +6920,13 @@ msgstr "Теги для этого вложения"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "Изменение пароля не удалось"
+msgstr "Изменение пароля не удалось."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "Смена пароля не разрешена"
+msgstr "Смена пароля не разрешена."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -7006,7 +6940,6 @@ msgstr "Команда исполнена"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
msgstr "Ошибка AJAX"
@@ -7099,7 +7032,7 @@ msgstr "%1$s покинул группу %2$s."
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: lib/command.php:426
-#, fuzzy, php-format
+#, php-format
msgctxt "WHOIS"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -7146,11 +7079,11 @@ msgstr ""
#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:488
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+"Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
msgstr[1] ""
"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
msgstr[2] ""
@@ -7176,11 +7109,10 @@ msgstr "Ошибка при повторении записи."
#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:591
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
+msgstr[0] "Запись слишком длинная — не больше %1$d символа, вы отправили %2$d."
msgstr[1] ""
"Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
msgstr[2] ""
@@ -7404,32 +7336,29 @@ msgstr ""
"tracking — пока не реализовано.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
-#, fuzzy
+#: lib/common.php:147
msgid "No configuration file found."
-msgstr "Конфигурационный файл не найден. "
+msgstr "Конфигурационный файл не найден."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
-#, fuzzy
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
-msgstr "Конфигурационные файлы искались в следующих местах: "
+msgstr "Конфигурационные файлы искались в следующих местах:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запустить установщик для исправления этого."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Перейти к установщику"
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "IM"
@@ -7441,10 +7370,9 @@ msgstr "Обновлено по IM"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
-msgstr "СМС"
+msgstr "SMS"
#. TRANS: Tooltip for Short Message Service menu item.
#: lib/connectsettingsaction.php:115
@@ -7453,7 +7381,6 @@ msgstr "Обновления по СМС"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Соединения"
@@ -7483,21 +7410,18 @@ msgstr ""
#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
#: lib/designsettings.php:139
-#, fuzzy
msgctxt "RADIO"
msgid "On"
-msgstr "Включить"
+msgstr "Включено"
#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
#: lib/designsettings.php:156
-#, fuzzy
msgctxt "RADIO"
msgid "Off"
-msgstr "Отключить"
+msgstr "Выключено"
#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
#: lib/designsettings.php:264
-#, fuzzy
msgctxt "BUTTON"
msgid "Reset"
msgstr "Сбросить"
@@ -7534,7 +7458,7 @@ msgstr "FOAF"
#. TRANS: Header for feed links (h2).
#: lib/feedlist.php:66
msgid "Feeds"
-msgstr ""
+msgstr "Каналы"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -7570,30 +7494,30 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
#: lib/groupeditform.php:163
-#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
-msgstr "Адрес страницы, дневника или профиля группы на другом портале"
+msgstr "Адрес домашней страницы или блога группы или темы."
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
msgstr "Опишите группу или тему"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d character or less"
msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Опишите группу или тему при помощи %d символов"
-msgstr[1] "Опишите группу или тему при помощи %d символов"
-msgstr[2] "Опишите группу или тему при помощи %d символов"
+msgstr[0] "Опишите группу или тему, используя до %d символов"
+msgstr[1] "Опишите группу или тему, используя до %d символов"
+msgstr[2] "Опишите группу или тему, используя до %d символов"
#: lib/groupeditform.php:182
-#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
-msgstr "Где находится группа, например «Город, область, страна»"
+msgstr ""
+"Местонахождение группы, если есть, например «Город, область (или регион), "
+"страна»."
#: lib/groupeditform.php:190
-#, fuzzy, php-format
+#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
"alias allowed."
@@ -7602,13 +7526,13 @@ msgid_plural ""
"aliases allowed."
msgstr[0] ""
"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
-"d имён"
+"d имя."
msgstr[1] ""
"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
-"d имён"
+"d имени."
msgstr[2] ""
"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
-"d имён"
+"d имён."
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:86
@@ -7738,29 +7662,29 @@ msgstr "Неподдерживаемый тип файла"
#. TRANS: Number of megabytes. %d is the number.
#: lib/imagefile.php:283
-#, fuzzy, php-format
+#, php-format
msgid "%dMB"
msgid_plural "%dMB"
-msgstr[0] "МБ"
-msgstr[1] "МБ"
-msgstr[2] "МБ"
+msgstr[0] "%dМБ"
+msgstr[1] "%dМБ"
+msgstr[2] "%dМБ"
#. TRANS: Number of kilobytes. %d is the number.
#: lib/imagefile.php:287
-#, fuzzy, php-format
+#, php-format
msgid "%dkB"
msgid_plural "%dkB"
-msgstr[0] "КБ"
-msgstr[1] "КБ"
-msgstr[2] "КБ"
+msgstr[0] "%dКБ"
+msgstr[1] "%dКБ"
+msgstr[2] "%dКБ"
#. TRANS: Number of bytes. %d is the number.
#: lib/imagefile.php:290
#, php-format
msgid "%dB"
msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dБ"
+msgstr[1] "%dБ"
msgstr[2] ""
#: lib/jabber.php:387
@@ -7794,7 +7718,7 @@ msgstr "Подтверждение электронного адреса"
#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to confirm at.
#: lib/mail.php:179
-#, fuzzy, php-format
+#, php-format
msgid ""
"Hey, %1$s.\n"
"\n"
@@ -7809,19 +7733,19 @@ msgid ""
"Thanks for your time, \n"
"%2$s\n"
msgstr ""
-"Здраствуйте, %s.\n"
+"Здравствуйте, %1$s.\n"
"\n"
-"Кто-то только что ввёл этот email-адрес на %s.\n"
+"Кто-то только что ввёл этот email-адрес на %2$s.\n"
"\n"
"Если это были вы и вы хотите подтвердить введённые данные, используйте "
"ссылку ниже:\n"
"\n"
-"%s\n"
+"%3$s\n"
"\n"
"Если нет, просто проигнорируйте это сообщение.\n"
"\n"
"Благодарим за потраченное время, \n"
-"%s\n"
+"%2$s\n"
#. TRANS: Subject of new-subscriber notification e-mail.
#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -7848,7 +7772,7 @@ msgstr ""
#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
#. TRANS: %7$s is a link to the addressed user's e-mail settings.
#: lib/mail.php:263
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
@@ -7867,10 +7791,10 @@ msgstr ""
"\n"
"%4$s%5$s%6$s\n"
"Искренне ваш,\n"
-"%7$s.\n"
+"%2$s.\n"
"\n"
"----\n"
-"Измените email-адрес и настройки уведомлений на %8$s\n"
+"Измените email-адрес и настройки уведомлений на %7$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail.
#. TRANS: %s is biographical information.
@@ -7890,7 +7814,7 @@ msgstr "Новый электронный адрес для постинга %s"
#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
#: lib/mail.php:321
-#, fuzzy, php-format
+#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
"\n"
@@ -7901,14 +7825,14 @@ msgid ""
"Faithfully yours,\n"
"%1$s"
msgstr ""
-"У Вас новый адрес постинга на %1$s.\n"
+"У вас новый адрес отправки на %1$s.\n"
"\n"
-"Посылайте электронные письма на %2$s для постинга новых записей.\n"
+"Посылайте электронные письма на %2$s для создания новых записей.\n"
"\n"
"Инструкции по электронным публикациям записей на %3$s.\n"
"\n"
"Искренне Ваш,\n"
-"%4$s"
+"%1$s"
#. TRANS: Subject line for SMS-by-email notification messages.
#. TRANS: %s is the posting user's nickname.
@@ -8013,9 +7937,9 @@ msgstr ""
#. TRANS: Subject for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:607
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) добавил вашу запись в число своих любимых"
+msgstr "%1$s (@%2$s) добавил вашу запись в число своих любимых"
#. TRANS: Body for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -8074,9 +7998,9 @@ msgstr ""
#. TRANS: E-mail subject for notice notification.
#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:680
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) отправил запись для вашего внимания"
+msgstr "%1$s (@%2$s) отправил запись для вашего внимания"
#. TRANS: Body of @-reply notification e-mail.
#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -8243,7 +8167,7 @@ msgstr ""
#: lib/mediafile.php:399
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "Тип файла «%s» не поддерживается не этом сервере."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -8251,15 +8175,13 @@ msgstr "Послать прямую запись"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Выбор лицензии"
+msgstr "Выберите получателя:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "Не подписаны!"
+msgstr "Нет взаимных подписчиков."
#: lib/messageform.php:153
msgid "To"
@@ -8274,6 +8196,26 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Отправить"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Послать запись"
@@ -8374,7 +8316,7 @@ msgstr "«Подтолкнуть» этого пользователя"
#: lib/oauthstore.php:294
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Ошибка размещения нового профиля."
#: lib/oauthstore.php:302
msgid "Error inserting avatar."
@@ -8510,7 +8452,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Метод API не найден."
@@ -8768,17 +8710,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "пару секунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8787,12 +8729,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "около часа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8801,12 +8743,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "около дня назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8815,12 +8757,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "около месяца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8829,7 +8771,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 11551884d..b38ecd9d9 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -513,22 +513,13 @@ msgstr ""
msgid "Could not find target user."
msgstr ""
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr ""
@@ -536,9 +527,9 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr ""
@@ -547,10 +538,10 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr ""
@@ -558,9 +549,9 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr ""
@@ -572,9 +563,9 @@ msgstr ""
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -585,9 +576,9 @@ msgstr[1] ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr ""
@@ -597,8 +588,8 @@ msgstr ""
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -607,7 +598,7 @@ msgstr[1] ""
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr ""
@@ -616,8 +607,8 @@ msgstr ""
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr ""
@@ -625,8 +616,8 @@ msgstr ""
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -815,7 +806,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -825,7 +816,7 @@ msgstr ""
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr ""
@@ -1873,24 +1864,24 @@ msgstr ""
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr ""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr ""
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr ""
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr ""
@@ -2034,7 +2025,7 @@ msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
@@ -2952,11 +2943,11 @@ msgstr ""
msgid "Login to site"
msgstr ""
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr ""
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
@@ -3340,7 +3331,7 @@ msgid "6 or more characters"
msgstr ""
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr ""
@@ -3352,11 +3343,11 @@ msgstr ""
msgid "Change"
msgstr ""
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr ""
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr ""
@@ -3699,7 +3690,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3707,7 +3698,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
@@ -3720,7 +3711,7 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3728,19 +3719,19 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr ""
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3748,7 +3739,7 @@ msgid "Location"
msgstr ""
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr ""
@@ -3799,7 +3790,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4068,7 +4059,7 @@ msgstr ""
msgid "Password and confirmation do not match."
msgstr ""
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr ""
@@ -4076,7 +4067,7 @@ msgstr ""
msgid "New password successfully saved. You are now logged in."
msgstr ""
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
@@ -4088,7 +4079,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -4096,84 +4087,84 @@ msgstr ""
msgid "Registration not allowed."
msgstr ""
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr ""
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr ""
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr ""
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr ""
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr ""
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr ""
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr ""
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, 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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4192,7 +4183,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -5911,18 +5902,18 @@ msgstr ""
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -6937,24 +6928,24 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr ""
@@ -7676,6 +7667,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr ""
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr ""
@@ -7910,7 +7919,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr ""
@@ -8156,17 +8165,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8174,12 +8183,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8187,12 +8196,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8200,12 +8209,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8213,7 +8222,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index af8c84707..700570d24 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:51+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:21+0000\n"
"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -533,23 +533,13 @@ msgstr "Kunde inte fastställa användare hos källan."
msgid "Could not find target user."
msgstr "Kunde inte hitta målanvändare."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -557,9 +547,9 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Inte ett giltigt smeknamn."
@@ -568,10 +558,10 @@ msgstr "Inte ett giltigt smeknamn."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Hemsida är inte en giltig webbadress."
@@ -579,9 +569,9 @@ msgstr "Hemsida är inte en giltig webbadress."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Fullständigt namn är för långt (max 255 tecken)."
@@ -593,9 +583,9 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -606,9 +596,9 @@ msgstr[1] "Beskrivning är för lång (max %d tecken)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -618,8 +608,8 @@ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -628,7 +618,7 @@ msgstr[1] "För många alias! Högst %d tillåtna."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Ogiltigt alias: \"%s\"."
@@ -637,8 +627,8 @@ msgstr "Ogiltigt alias: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Alias \"%s\" används redan. Försök med ett annat."
@@ -646,8 +636,8 @@ msgstr "Alias \"%s\" används redan. Försök med ett annat."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Alias kan inte vara samma som smeknamn."
@@ -844,7 +834,7 @@ msgstr "Konto"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -854,7 +844,7 @@ msgstr "Smeknamn"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lösenord"
@@ -1925,24 +1915,24 @@ msgstr "Använd detta formulär för att redigera gruppen."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Ogiltigt alias: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Kunde inte uppdatera grupp."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Kunde inte skapa alias."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Alternativ sparade."
@@ -2089,7 +2079,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:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
@@ -3082,11 +3072,11 @@ msgstr "Logga in"
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Kom ihåg mig"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
@@ -3486,7 +3476,7 @@ msgid "6 or more characters"
msgstr "Minst 6 tecken"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Bekräfta"
@@ -3498,11 +3488,11 @@ msgstr "Samma som lösenordet ovan"
msgid "Change"
msgstr "Ändra"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Lösenordet måste vara minst 6 tecken."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Lösenorden matchar inte."
@@ -3861,7 +3851,7 @@ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3869,7 +3859,7 @@ msgstr "Fullständigt namn"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
@@ -3883,7 +3873,7 @@ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3891,19 +3881,19 @@ msgstr[0] "Beskriv dig själv och dina intressen med högst 140 tecken"
msgstr[1] "Beskriv dig själv och dina intressen med högst 140 tecken"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Beskriv dig själv och dina intressen"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Biografi"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3911,7 +3901,7 @@ msgid "Location"
msgstr "Plats"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Var du håller till, såsom \"Stad, Län, Land\""
@@ -3966,7 +3956,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4255,7 +4245,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Fel uppstog i användarens inställning"
@@ -4263,7 +4253,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
@@ -4275,7 +4265,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -4283,19 +4273,19 @@ msgstr "Registrera"
msgid "Registration not allowed."
msgstr "Registrering inte tillåten."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "E-postadressen finns redan."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Ogiltigt användarnamn eller lösenord."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4303,64 +4293,64 @@ 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:434
+#: actions/register.php:433
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:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "Minst 6 tecken. Måste fyllas i."
-#: actions/register.php:443
+#: actions/register.php:442
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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "E-post"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
"Jag förstår att innehåll och data av %1$s är privata och konfidentiella."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
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:539
+#: actions/register.php:538
msgid "My text and files remain under my own copyright."
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Alla rättigheter reserverade."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4369,7 +4359,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:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4402,7 +4392,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:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6231,18 +6221,18 @@ msgstr "%1$s lyssnar nu på dina notiser på %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Välkommen till %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7312,26 +7302,26 @@ msgstr ""
"tracking - inte implementerat än.\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Ingen konfigurationsfil hittades. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "Jag letade efter konfigurationsfiler på följande platser: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Du kanske vill köra installeraren för att åtgärda detta."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Gå till installeraren."
@@ -8169,6 +8159,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Skicka"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Skicka en notis"
@@ -8405,7 +8414,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "API-metod hittades inte."
@@ -8657,17 +8666,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8675,12 +8684,12 @@ msgstr[0] "för ungefär en minut sedan"
msgstr[1] "för ungefär %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8688,12 +8697,12 @@ msgstr[0] "för ungefär en timma sedan"
msgstr[1] "för ungefär %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8701,12 +8710,12 @@ msgstr[0] "för ungefär en dag sedan"
msgstr[1] "för ungefär %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8714,7 +8723,7 @@ msgstr[0] "för ungefär en månad sedan"
msgstr[1] "för ungefär %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 716eab6fa..8b9480390 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:52+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:21+0000\n"
"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -525,22 +525,13 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
msgid "Could not find target user."
msgstr "లక్ష్యిత వాడుకరిని కనుగొనలేకపోయాం."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -548,9 +539,9 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "సరైన పేరు కాదు."
@@ -559,10 +550,10 @@ msgstr "సరైన పేరు కాదు."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -570,9 +561,9 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
@@ -585,9 +576,9 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, fuzzy, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -598,9 +589,9 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
#, fuzzy
msgid "Location is too long (maximum 255 characters)."
msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -611,8 +602,8 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, fuzzy, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -621,7 +612,7 @@ msgstr[1] "చాలా మారుపేర్లు! %d గరిష్ఠం
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "తప్పుడు మారుపేరు: \"%s\"."
@@ -630,8 +621,8 @@ msgstr "తప్పుడు మారుపేరు: \"%s\"."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
@@ -639,8 +630,8 @@ msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటిక
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
@@ -833,7 +824,7 @@ msgstr "ఖాతా"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -843,7 +834,7 @@ msgstr "పేరు"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "సంకేతపదం"
@@ -1919,24 +1910,24 @@ msgstr "గుంపుని మార్చడానికి ఈ ఫారా
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "తప్పుడు మారుపేరు: \"%s\""
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "గుంపుని తాజాకరించలేకున్నాం."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "ఎంపికలు భద్రమయ్యాయి."
@@ -2087,7 +2078,7 @@ msgid "Cannot normalize that email address"
msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
@@ -3061,11 +3052,11 @@ msgstr "ప్రవేశించండి"
msgid "Login to site"
msgstr "సైటు లోనికి ప్రవేశించు"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "నన్ను గుర్తుంచుకో"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
@@ -3463,7 +3454,7 @@ msgid "6 or more characters"
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "నిర్థారించు"
@@ -3475,11 +3466,11 @@ msgstr "పై సంకేతపదం వలెనే"
msgid "Change"
msgstr "మార్చు"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "సంకేతపదం తప్పనిసరిగా 6 లేదా అంతకంటే ఎక్కువ అక్షరాలుండాలి."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "సంకేతపదాలు సరిపోలలేదు."
@@ -3843,7 +3834,7 @@ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అ
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3851,7 +3842,7 @@ msgstr "పూర్తి పేరు"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమ్ పేజీ"
@@ -3865,7 +3856,7 @@ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వ
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3873,19 +3864,19 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "స్వపరిచయం"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3893,7 +3884,7 @@ msgid "Location"
msgstr "ప్రాంతం"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
@@ -3944,7 +3935,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4233,7 +4224,7 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్
msgid "Password and confirmation do not match."
msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
#, fuzzy
msgid "Error setting user."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
@@ -4242,7 +4233,7 @@ msgstr "వాడుకరిని భద్రపరచడంలో పొర
msgid "New password successfully saved. You are now logged in."
msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
@@ -4254,7 +4245,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -4262,77 +4253,77 @@ msgstr "నమోదు"
msgid "Registration not allowed."
msgstr "నమోదు అనుమతించబడదు."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "ఈమెయిల్"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "సర్వహక్కులూ సురక్షితం."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4341,7 +4332,7 @@ msgstr ""
"నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
"చిరునామా, మరియు ఫోన్ నంబర్."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4372,7 +4363,7 @@ msgstr ""
"\n"
"నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6167,18 +6158,18 @@ msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7223,26 +7214,26 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "స్వరూపణపు దస్త్రమేమీ కనబడలేదు. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "స్వరూపణపు దస్త్రాల కొరకు ఈ ప్రదేశాలతో చూసాం: "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
#, fuzzy
msgid "Go to the installer."
msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -8065,6 +8056,24 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "పంపించు"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "సైటు గమనిక"
@@ -8305,7 +8314,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -8556,17 +8565,17 @@ msgid "Moderator"
msgstr "సమన్వయకర్త"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8574,46 +8583,46 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
msgstr[1] "సుమారు %d నిమిషాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "ఒక గంట"
-msgstr[1] "%d గంటల"
+msgstr[0] "సుమారు ఒక గంట క్రితం"
+msgstr[1] "సుమారు %d గంటల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "ఒక రోజు"
-msgstr[1] "%d రోజుల"
+msgstr[0] "ఒక రోజు క్రితం"
+msgstr[1] "%d రోజుల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "ఒక నెల"
-msgstr[1] "%d నెలల"
+msgstr[0] "ఒక నెల క్రితం"
+msgstr[1] "%d నెలల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index c3f40258a..07e98b52e 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:39:53+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:22+0000\n"
"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-07 21:20:20+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -535,24 +535,13 @@ msgstr "Kaynak kullanıcı belirlenemedi."
msgid "Could not find target user."
msgstr "Hedef kullanıcı bulunamadı."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: 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 "
-"kullanılamaz. "
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -560,9 +549,9 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Geçersiz bir takma ad."
@@ -571,10 +560,10 @@ msgstr "Geçersiz bir takma ad."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -582,9 +571,9 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -596,9 +585,9 @@ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -608,9 +597,9 @@ msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -620,8 +609,8 @@ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -629,7 +618,7 @@ msgstr[0] "Çok fazla diğerisim! En fazla %d taneye izin veriliyor."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Geçersiz büyüklük."
@@ -638,8 +627,8 @@ msgstr "Geçersiz büyüklük."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
@@ -647,8 +636,8 @@ msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
@@ -845,7 +834,7 @@ msgstr "Hesap"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -855,7 +844,7 @@ msgstr "Takma ad"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Parola"
@@ -1939,24 +1928,24 @@ msgstr "Grubu düzenlemek için bu biçimi kullan."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "%s Geçersiz başlangıç sayfası"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Grup güncellenemedi."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Kullanıcı güncellenemedi."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Seçenekler kaydedildi."
@@ -2109,7 +2098,7 @@ msgid "Cannot normalize that email address"
msgstr "Jabber işlemlerinde bir hata oluştu."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
@@ -3063,11 +3052,11 @@ msgstr "Giriş"
msgid "Login to site"
msgstr "Siteye giriş"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Beni hatırla"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
@@ -3467,7 +3456,7 @@ msgid "6 or more characters"
msgstr "6 veya daha fazla karakter"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Onayla"
@@ -3479,11 +3468,11 @@ msgstr "yukarıdaki parolanın aynısı"
msgid "Change"
msgstr "Değiştir"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Parolalar birbirini tutmuyor."
@@ -3850,7 +3839,7 @@ msgstr ""
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3858,7 +3847,7 @@ msgstr "Tam İsim"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
@@ -3873,27 +3862,27 @@ msgstr ""
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Hakkında"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3901,7 +3890,7 @@ msgid "Location"
msgstr "Yer"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
@@ -3954,7 +3943,7 @@ msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, fuzzy, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4241,7 +4230,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:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Kullanıcı ayarlamada hata oluştu."
@@ -4249,7 +4238,7 @@ 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:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
@@ -4262,7 +4251,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr "Kayıt başarılı"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -4270,84 +4259,84 @@ msgstr "Kayıt"
msgid "Registration not allowed."
msgstr "Kayıt yapılmasına izin verilmiyor."
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Eposta adresi zaten var."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Geçersiz kullanıcı adı veya parola."
-#: actions/register.php:352
+#: actions/register.php:351
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:434
+#: actions/register.php:433
#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
"verilmez"
-#: actions/register.php:439
+#: actions/register.php:438
#, fuzzy
msgid "6 or more characters. Required."
msgstr "6 veya daha fazla karakter"
-#: actions/register.php:443
+#: actions/register.php:442
#, fuzzy
msgid "Same as password above. Required."
msgstr "yukarıdaki parolanın aynısı"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Eposta"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
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:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr ""
-#: actions/register.php:464
+#: actions/register.php:463
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/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:535
+#: actions/register.php:534
#, 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:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Tüm hakları saklıdır."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, fuzzy, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4356,7 +4345,7 @@ msgstr ""
"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
"numarası."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4375,7 +4364,7 @@ msgid ""
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6164,18 +6153,18 @@ msgstr "%1$s %2$s'da durumunuzu takip ediyor"
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr ""
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr ""
@@ -7217,25 +7206,25 @@ msgid ""
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
#, fuzzy
msgid "No configuration file found."
msgstr "Onay kodu yok."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr ""
@@ -7986,6 +7975,25 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Gönder"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
+"kullanılamaz. "
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
#, fuzzy
msgid "Send a notice"
@@ -8231,7 +8239,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Böyle bir kullanıcı yok."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
#, fuzzy
msgid "Page not found."
msgstr "Onay kodu bulunamadı."
@@ -8493,60 +8501,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
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:1180
+#: lib/util.php:1279
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:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
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:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
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:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
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:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
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 fff6226a4..650ccffd7 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:56:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:23+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -543,24 +543,13 @@ msgstr "Не вдалось встановити джерело користув
msgid "Could not find target user."
msgstr "Не вдалося знайти цільового користувача."
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -568,9 +557,9 @@ msgstr "Це ім’я вже використовується. Спробуйт
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Це недійсне ім’я користувача."
@@ -579,10 +568,10 @@ msgstr "Це недійсне ім’я користувача."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -590,9 +579,9 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -604,9 +593,9 @@ msgstr "Повне ім’я надто довге (не більше 255 сим
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -618,9 +607,9 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "Розташування надто довге (не більше 255 символів)."
@@ -630,8 +619,8 @@ msgstr "Розташування надто довге (не більше 255 с
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -641,7 +630,7 @@ msgstr[2] "Надто багато додаткових імен! Максиму
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Помилкове додаткове ім’я: «%s»."
@@ -650,8 +639,8 @@ msgstr "Помилкове додаткове ім’я: «%s»."
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "Додаткове ім’я «%s» вже використовується. Спробуйте інше."
@@ -659,8 +648,8 @@ msgstr "Додаткове ім’я «%s» вже використовуєть
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "Додаткове ім’я не може бути таким самим що й основне."
@@ -857,7 +846,7 @@ msgstr "Акаунт"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -867,7 +856,7 @@ msgstr "Ім’я користувача"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
@@ -1942,24 +1931,24 @@ msgstr "Скористайтесь цією формою, щоб відреда
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Помилкове додаткове ім’я: «%s»"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "Не вдалося оновити спільноту."
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "Неможна призначити додаткові імена."
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "Опції збережено."
@@ -2105,7 +2094,7 @@ msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійсна електронна адреса."
@@ -3103,11 +3092,11 @@ msgstr "Увійти"
msgid "Login to site"
msgstr "Вхід на сайт"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Пам’ятати мене"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr ""
"Автоматично входити у майбутньому; не для комп’ютерів загального "
@@ -3515,7 +3504,7 @@ msgid "6 or more characters"
msgstr "6 або більше знаків"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "Підтвердити"
@@ -3527,11 +3516,11 @@ msgstr "Такий само, як і пароль вище"
msgid "Change"
msgstr "Змінити"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "Пароль має складатись з 6-ти або більше знаків."
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "Паролі не співпадають."
@@ -3878,7 +3867,7 @@ msgstr "1-64 рядкових літер і цифр, ніякої пункту
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3886,7 +3875,7 @@ msgstr "Повне ім’я"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-сторінка"
@@ -3899,7 +3888,7 @@ msgstr "URL-адреса вашої веб-сторінки, блоґу, або
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
@@ -3908,19 +3897,19 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "Опишіть себе та свої інтереси"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Про себе"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3928,7 +3917,7 @@ msgid "Location"
msgstr "Розташування"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
@@ -3982,7 +3971,7 @@ msgstr ""
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4270,7 +4259,7 @@ msgstr "Пароль має складатись з 6-ти або більше
msgid "Password and confirmation do not match."
msgstr "Пароль та підтвердження не співпадають."
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Помилка в налаштуваннях користувача."
@@ -4278,7 +4267,7 @@ msgstr "Помилка в налаштуваннях користувача."
msgid "New password successfully saved. You are now logged in."
msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
"Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
@@ -4291,7 +4280,7 @@ msgstr "Даруйте, помилка у коді запрошення."
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -4299,19 +4288,19 @@ msgstr "Реєстрація"
msgid "Registration not allowed."
msgstr "Реєстрацію не дозволено."
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Ця адреса вже використовується."
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "Недійсне ім’я або пароль."
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4319,61 +4308,61 @@ msgstr ""
"Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
"будете в курсі справ ваших друзів та колег. "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
"Неодмінно."
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "6 або більше знаків. Неодмінно."
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "Такий само, як і пароль вище. Неодмінно."
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Пошта"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "Повне ім’я, звісно ж ваше справжнє ім’я"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "Я розумію, що зміст і дані %1$s є приватними і конфіденційними."
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "Авторські права на мої тексти і файли належать %1$s."
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "Всі права захищені."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4382,7 +4371,7 @@ msgstr ""
"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
"електронна адреса, адреса IM, телефонний номер."
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4415,7 +4404,7 @@ msgstr ""
"Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
"сервіс."
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6246,18 +6235,18 @@ msgstr "%1$s тепер слідкує за %2$s."
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "Користувача для однокористувацького режиму не визначено."
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
@@ -6865,7 +6854,7 @@ msgstr "Скасувати"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "від "
+msgstr " від "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -6898,7 +6887,7 @@ msgstr "Відкликати"
#: lib/atom10feed.php:112
msgid "author element must contain a name element."
-msgstr "авторський елемент повинен містити назву елемента."
+msgstr "елемент author повинен містити елемент name."
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:294
@@ -7341,24 +7330,24 @@ msgstr ""
"tracking — наразі не виконується\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "Файл конфігурації не знайдено."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "Пошук файлів конфігурації проводився тут:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "Запустіть файл інсталяції, аби полагодити це."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "Іти до файлу інсталяції."
@@ -8208,6 +8197,27 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Так"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
+"інтервалів."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "Надіслати допис"
@@ -8444,7 +8454,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Відкликати роль «%s» для цього користувача"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "Сторінку не знайдено."
@@ -8701,17 +8711,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8720,12 +8730,12 @@ msgstr[1] "близько %d хвилин тому"
msgstr[2] "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8734,12 +8744,12 @@ msgstr[1] "близько %d годин тому"
msgstr[2] "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8748,12 +8758,12 @@ msgstr[1] "близько %d днів тому"
msgstr[2] "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "місяць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8762,7 +8772,7 @@ msgstr[1] "близько %d місяців тому"
msgstr[2] "близько %d місяців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "близько року тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 2c99c2290..5b007d105 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -9,377 +9,807 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:30+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:24+0000\n"
"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
-#. TRANS: Page title
+#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
msgid "Access"
msgstr "Truy cập"
+#. TRANS: Page notice.
+#: actions/accessadminpanel.php:64
+#, fuzzy
+msgid "Site access settings"
+msgstr "Thay đổi hình đại diện"
+
#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
+#: actions/accessadminpanel.php:151
msgid "Registration"
msgstr "Đăng ký"
-#. TRANS: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. TRANS: Checkbox instructions for admin setting "Private".
+#: actions/accessadminpanel.php:155
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
+#: actions/accessadminpanel.php:157
msgctxt "LABEL"
msgid "Private"
msgstr "Riêng tư"
-#. TRANS: Checkbox instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+#: actions/accessadminpanel.php:164
msgid "Make registration invitation only."
msgstr ""
-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:166
+#, fuzzy
+msgid "Invite only"
+msgstr "Thư mời"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+#: actions/accessadminpanel.php:173
msgid "Disable new registrations."
msgstr ""
#. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:185
+#: actions/accessadminpanel.php:175
msgid "Closed"
msgstr "Đóng"
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191
+#, fuzzy
+msgid "Save access settings"
+msgstr "Thay đổi hình đại diện"
+
+#. TRANS: Tooltip for button to save access settings in site admin panel.
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
#. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207
msgctxt "BUTTON"
msgid "Save"
msgstr "Lưu"
+#. TRANS: Server error when page not found (404).
+#. TRANS: Server error when page not found (404)
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
+#: actions/showfavorites.php:138 actions/tag.php:52
+#, fuzzy
+msgid "No such page."
+msgstr "Không có tin nhắn nào."
+
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:115
-#: actions/apiaccountupdateprofile.php:106
-#: actions/apiaccountupdateprofilebackgroundimage.php:117
-#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
-#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/all.php:80 actions/allrss.php:69
+#: actions/apiaccountupdatedeliverydevice.php:110
+#: actions/apiaccountupdateprofile.php:103
+#: actions/apiaccountupdateprofilebackgroundimage.php:118
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
+#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
+#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
+#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
+#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
+#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
+#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
+#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "Không có user nào."
-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:91
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s và bạn bè"
+
+#. TRANS: Page title. %s is user nickname
+#. TRANS: H1 text for page. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
+#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
+#: lib/personalgroupnav.php:103
#, php-format
msgid "%s and friends"
msgstr "%s và bạn bè"
-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. TRANS: %s is user nickname.
+#: actions/all.php:108
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Chọn những người bạn của %s"
+
+#. TRANS: %s is user nickname.
+#: actions/all.php:117
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Chọn những người bạn của %s"
+
+#. TRANS: %s is user nickname.
+#: actions/all.php:126
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Chọn những người bạn của %s"
+
+#. TRANS: Empty list message. %s is a user nickname.
+#: actions/all.php:139
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
-#: actions/all.php:143
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:146
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#: actions/all.php:150
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to them."
msgstr ""
-#. TRANS: H1 text
-#: actions/all.php:182
+#. TRANS: H1 text for page when viewing a list for self.
+#: actions/all.php:188
msgid "You and friends"
msgstr "Bạn và bạn bè"
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:122 actions/apitimelinefriends.php:213
+#: actions/apitimelinehome.php:119
+#, fuzzy, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
+
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
+#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
+#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#: actions/apiaccountratelimitstatus.php:69
+#: actions/apiaccountupdatedeliverydevice.php:92
+#: actions/apiaccountupdateprofile.php:94
+#: actions/apiaccountupdateprofilebackgroundimage.php:92
+#: actions/apiaccountupdateprofilecolors.php:115
+#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
+#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
+#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
+#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
+#: actions/apigroupshow.php:114 actions/apihelptest.php:84
+#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
+#: actions/apitimelineretweetedtome.php:118
+#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
+#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
+#, fuzzy
+msgid "API method not found."
+msgstr "Phương thức API không tìm thấy!"
+
#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: actions/apiaccountupdatedeliverydevice.php:87
-#: actions/apiaccountupdateprofile.php:90
-#: actions/apiaccountupdateprofilebackgroundimage.php:87
-#: actions/apiaccountupdateprofilecolors.php:111
-#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
-#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
-#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
-#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
-#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
-#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
-#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
+#: actions/apiaccountupdatedeliverydevice.php:83
+#: actions/apiaccountupdateprofile.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:83
+#: actions/apiaccountupdateprofilecolors.php:106
+#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
+#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
+#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
+#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
+#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
+#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
-#: actions/apiaccountupdatedeliverydevice.php:107
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+#: actions/apiaccountupdatedeliverydevice.php:103
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-#: actions/apiaccountupdateprofile.php:113
-#: actions/apiaccountupdateprofilebackgroundimage.php:195
-#: actions/apiaccountupdateprofilecolors.php:186
-#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130
+#, fuzzy
+msgid "Could not update user."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "Người dùng không có thông tin."
-#: actions/apiaccountupdateprofilebackgroundimage.php:109
-#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#. TRANS: Form validation error in design settings form. POST should remain untranslated.
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
+#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
#, php-format
msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
+msgstr[0] ""
+
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#. TRANS: Error displayed when updating design settings fails.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:191
+#: actions/apiaccountupdateprofilecolors.php:139
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/apiatomservice.php:85
+msgid "Main"
msgstr ""
-#: actions/apidirectmessage.php:89
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "Dòng tin công cộng"
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104
+#, fuzzy
+msgid "You cannot block yourself!"
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126
+#, fuzzy
+msgid "Block user failed."
+msgstr "Chặn người dùng"
+
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113
+#, fuzzy
+msgid "Unblock user failed."
+msgstr "Bỏ chặn người dùng này"
+
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88
#, php-format
msgid "Direct messages from %s"
msgstr "Bạn có tin nhắn riêng từ %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:93
+#, fuzzy, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
+
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102
#, php-format
msgid "Direct messages to %s"
msgstr "Bạn có tin nhắn riêng từ %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107
#, php-format
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117
+#, fuzzy
+msgid "No message text!"
+msgstr "Không có tin nhắn nào."
+
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
-"về bạn."
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Không tìm thấy mã xác nhận."
-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+#: actions/apifavoritecreate.php:120
+#, fuzzy
+msgid "This status is already a favorite."
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
+#. TRANS: Client error displayed when marking a notice as favourite fails.
#. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
msgid "Could not create favorite."
msgstr "Không thể tạo favorite."
-#: actions/apifavoritedestroy.php:124
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite."
msgstr "Không thể tạo favorite."
-#: actions/apifriendshipscreate.php:119
+#. TRANS: Client error displayed when removing a favourite has failed.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#, fuzzy
+msgid "Could not delete favorite."
+msgstr "Không thể tạo favorite."
+
+#. TRANS: Client error displayed when trying follow who's profile could not be found.
+#: actions/apifriendshipscreate.php:109
+#, fuzzy
+msgid "Could not follow user: profile not found."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#: actions/apifriendshipscreate.php:120
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#. TRANS: Client error displayed when trying to unfollow self.
+#: actions/apifriendshipsdestroy.php:121
+#, fuzzy
+msgid "You cannot unfollow yourself."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+#: actions/apifriendshipsexists.php:88
+msgid "Two valid IDs or nick names must be supplied."
msgstr ""
-#: actions/apifriendshipsshow.php:134
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:131
msgid "Could not determine source user."
msgstr "Không thể cập nhật thành viên."
-#: actions/apifriendshipsshow.php:142
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:140
msgid "Could not find target user."
msgstr "Không thể cập nhật thành viên."
-#: actions/apigroupcreate.php:168 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: 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:177 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
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:184 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "Biệt hiệu không hợp lệ."
-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "Trang chủ không phải là URL"
-#: actions/apigroupcreate.php:209 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: 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ự)."
-
-#: actions/apigroupcreate.php:217 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "Tên khu vực quá dài (không quá %d ký tự)."
-
-#: actions/apigroupcreate.php:228 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: 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ự)."
+#. TRANS: Client error in form for group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
+msgid "Full name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] ""
-#: actions/apigroupcreate.php:247 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
-msgstr ""
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
+msgid "Location is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] ""
-#: actions/apigroupcreate.php:268
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "Địa chỉ email không đúng:%s"
-#: actions/apigroupcreate.php:290 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
+#, fuzzy, php-format
+msgid "Alias \"%s\" 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."
+
+#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr ""
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
-#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
+#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
msgid "Group not found."
msgstr "Không tìm thấy nhóm."
+#. TRANS: Server error displayed when trying to join a group the user is already a member of.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
msgid "You are already a member of that group."
msgstr "Bạn chưa cập nhật thông tin riêng"
+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr ""
-#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Server error displayed when joining a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.
+#: actions/apigroupleave.php:115
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: lib/command.php:398
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#: actions/apigrouplist.php:94
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s và nhóm"
+
+#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#: actions/apigrouplist.php:104
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#: actions/apigrouplistall.php:88 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "Hộp thư đi của %s"
-#: actions/apioauthauthorize.php:101
+#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
+#: actions/apigrouplistall.php:93
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Mã nhóm"
+
+#. TRANS: Client error displayed when uploading a media file has failed.
+#: actions/apimediaupload.php:101
+#, fuzzy
+msgid "Upload failed."
+msgstr "Tải file"
+
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+#: actions/apioauthaccesstoken.php:101
+msgid "Invalid request token or verifier."
+msgstr ""
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:107
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
+msgid "Invalid request token."
+msgstr ""
+
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+#: actions/apioauthauthorize.php:121
+msgid "Request token already authorized."
+msgstr ""
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:230
-#: 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/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350
#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
+#: lib/designsettings.php:310
msgid "There was a problem with your session token. Try again, please."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+#: actions/apioauthauthorize.php:168
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+msgid "Database error inserting oauth_token_association."
msgstr ""
+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error when submitting a form with unexpected information.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:121
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
+#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "Bất ngờ gửi mẫu thông tin. "
-#: actions/apioauthauthorize.php:259
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+#: actions/apioauthauthorize.php:387
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:425
+#, php-format
+msgid ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#: actions/apioauthauthorize.php:433
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -387,330 +817,808 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+msgctxt "LEGEND"
msgid "Account"
-msgstr "Tài khoản"
+msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group nickname (dt). Text hidden by default.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:132
+#: lib/userprofile.php:134
msgid "Nickname"
msgstr "Biệt danh"
+#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Mật khẩu"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr ""
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Hủy"
-#: actions/apioauthauthorize.php:334
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+#: actions/apioauthauthorize.php:485
+msgctxt "BUTTON"
msgid "Allow"
msgstr ""
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#. TRANS: Form instructions.
+#: actions/apioauthauthorize.php:502
+msgid "Authorize access to your account information."
+msgstr ""
+
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+#: actions/apioauthauthorize.php:594
+msgid "Authorization canceled."
+msgstr ""
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#: actions/apioauthauthorize.php:598
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:621
+msgid "You have successfully authorized the application"
+msgstr ""
+
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+#: actions/apioauthauthorize.php:625
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:632
+#, php-format
+msgid "You have successfully authorized %s"
+msgstr ""
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#: actions/apioauthauthorize.php:639
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
-#: actions/apistatusesdestroy.php:112
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+#: actions/apistatusesdestroy.php:111
msgid "This method requires a POST or DELETE."
msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
-#: actions/apistatusesdestroy.php:135
+#. TRANS: Client error displayed trying to delete a status of another user.
+#: actions/apistatusesdestroy.php:136
msgid "You may not delete another user's status."
msgstr "Bạn đã không xóa trạng thái của những người khác."
-#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/deletenotice.php:61 actions/shownotice.php:92
msgid "No such notice."
msgstr "Không có tin nhắn nào."
+#. TRANS: Client error displayed trying to repeat an own notice through the API.
#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:84 lib/command.php:538
+#: actions/apistatusesretweet.php:83 lib/command.php:537
msgid "Cannot repeat your own notice."
msgstr "Không thể xóa tin nhắn này."
+#. TRANS: Client error displayed trying to re-repeat a notice through the API.
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:543
msgid "Already repeated that notice."
msgstr "Không thể xóa tin nhắn này."
-#: actions/apistatusesshow.php:145
+#: actions/apistatusesshow.php:117
+msgid "HTTP method not supported."
+msgstr ""
+
+#: actions/apistatusesshow.php:141
+#, php-format
+msgid "Unsupported format: %s"
+msgstr ""
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152
+#, fuzzy
+msgid "Status deleted."
+msgstr "Hình đại diện đã được cập nhật."
+
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesupdate.php:222
-msgid "Client must provide a 'status' parameter with a value."
+#: actions/apistatusesshow.php:227
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "Không thể xóa tin nhắn này."
+
+#: actions/apistatusesshow.php:247
+#, php-format
+msgid "Deleted notice %d"
msgstr ""
-#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
-msgid "Not found."
-msgstr "Không tìm thấy."
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#: actions/apistatusesupdate.php:221
+msgid "Client must provide a 'status' parameter with a value."
+msgstr ""
-#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] ""
+
+#. TRANS: Client error displayed when replying to a non-existing notice.
+#: actions/apistatusesupdate.php:284
+msgid "Parent notice not found."
msgstr ""
-#: actions/apitimelinefavorites.php:110
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
+#, php-format
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] ""
+
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
+#, fuzzy
+msgid "Unsupported format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinefavorites.php:108
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
-#: actions/apitimelinefavorites.php:119
+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#: actions/apitimelinefavorites.php:120
#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "Dòng tin nhắn cho %s"
+msgid "%1$s updates favorited by %2$s / %3$s."
+msgstr ""
-#: actions/apitimelinementions.php:118
+#. TRANS: Server error displayed when generating an Atom feed fails.
+#. TRANS: %s is the error.
+#: actions/apitimelinegroup.php:138
+#, php-format
+msgid "Could not generate feed for group - %s"
+msgstr ""
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#: actions/apitimelinementions.php:115
#, php-format
msgid "%1$s / Updates mentioning %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.
#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
+#, fuzzy, php-format
+msgid "%s public timeline"
+msgstr "Dòng tin công cộng"
+
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s cập nhật từ tất cả mọi người!"
-#: actions/apitimelinetag.php:105 actions/tag.php:67
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+#: actions/apitimelineretweetedbyme.php:71
+msgid "Unimplemented."
+msgstr ""
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#: actions/apitimelineretweetedtome.php:108
+#, fuzzy, php-format
+msgid "Repeated to %s"
+msgstr "Trả lời cho %s"
+
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#: actions/apitimelineretweetsofme.php:112
+#, fuzzy, php-format
+msgid "Repeats of %s"
+msgstr "Trả lời cho %s"
+
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/apitrends.php:87
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#: actions/apitimelinetag.php:105 actions/tagrss.php:65
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/apitimelineuser.php:300
+msgid "Only the user can add to their own timeline."
+msgstr ""
+
+#: actions/apitimelineuser.php:306
+msgid "Only accept AtomPub for atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:316
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#: actions/apitimelineuser.php:325
+msgid "Can only handle post activities."
+msgstr ""
+
+#: actions/apitimelineuser.php:334
+#, php-format
+msgid "Cannot handle activity object type \"%s\""
+msgstr ""
+
+#: actions/apitimelineuser.php:392
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:423
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+
+#. TRANS: Server error for unfinished API method showTrends.
+#: actions/apitrends.php:85
msgid "API method under construction."
msgstr "Phương thức API dưới cấu trúc có sẵn."
+#. TRANS: Client error displayed when requesting user information for a non-existing user.
+#: actions/apiusershow.php:94
+msgid "User not found."
+msgstr "Không tìm thấy user."
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
msgstr "Không có tin nhắn nào."
-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:116
msgid "No nickname."
msgstr "Không có biệt hiệu."
-#: actions/avatarbynickname.php:64
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+#: actions/avatarbynickname.php:66
msgid "No size."
msgstr "Không có kích thước."
-#: actions/avatarbynickname.php:69
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+#: actions/avatarbynickname.php:72
msgid "Invalid size."
msgstr "Kích thước không hợp lệ."
+#. TRANS: Title for avatar upload page.
+#. TRANS: Label for group avatar (dt). Text hidden by default.
#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr "Hình đại diện"
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:108
msgid "User without matching profile."
msgstr "Người dùng không có thông tin."
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
#: actions/grouplogo.php:254
msgid "Avatar settings"
msgstr "Thay đổi hình đại diện"
-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
msgstr ""
-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
#: actions/grouplogo.php:213 actions/grouplogo.php:274
msgid "Preview"
msgstr "Xem trước"
-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#. TRANS: Button on avatar upload page to delete current avatar.
+#: actions/avatarsettings.php:155
+msgctxt "BUTTON"
msgid "Delete"
-msgstr "Xóa"
+msgstr ""
-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. TRANS: Button on avatar upload page to upload an avatar.
+#: actions/avatarsettings.php:173
+msgctxt "BUTTON"
msgid "Upload"
-msgstr "Tải file"
+msgstr ""
+
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+#: actions/avatarsettings.php:243
+msgctxt "BUTTON"
+msgid "Crop"
+msgstr ""
-#: actions/avatarsettings.php:332
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+#: actions/avatarsettings.php:318
+#, fuzzy
+msgid "No file uploaded."
+msgstr "Upload từng phần."
+
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346
msgid "Pick a square area of the image to be your avatar"
msgstr ""
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr ""
-#: actions/avatarsettings.php:370
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
msgid "Avatar updated."
msgstr "Hình đại diện đã được cập nhật."
-#: actions/avatarsettings.php:373
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389
msgid "Failed updating avatar."
msgstr "Cập nhật hình đại diện không thành công."
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "Hình đại diện đã được cập nhật."
+
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Bạn đã theo những người này:"
+
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
msgstr "Chặn người dùng"
-#: actions/block.php:138
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+#: actions/block.php:139
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 "
"will not be notified of any @-replies from them."
msgstr ""
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
+#: actions/deleteuser.php:152 actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
+msgid "No"
+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:158 actions/deleteuser.php:156
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Bỏ chặn người dùng này"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
+#: actions/deleteuser.php:159 actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Có"
+
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:165 lib/blockform.php:79
msgid "Block this user"
msgstr "Bỏ chặn người dùng này"
-#: actions/block.php:187
+#. TRANS: Server error displayed when blocking a user fails.
+#: actions/block.php:189
msgid "Failed to save block information."
msgstr ""
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
#. TRANS: Command exception text shown when a group is requested that does not exist.
#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
#: actions/groupmembers.php:83 actions/groupmembers.php:90
#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
msgid "No such group."
msgstr "Không có user nào."
-#: actions/blockedfromgroup.php:115
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#: actions/blockedfromgroup.php:101
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "Hồ sơ"
+
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#: actions/blockedfromgroup.php:106
+#, fuzzy, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%s và bạn bè"
+
+#. TRANS: Instructions for list of users blocked from a group.
+#: actions/blockedfromgroup.php:122
msgid "A list of the users blocked from joining this group."
msgstr ""
-#. TRANS: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "Bỏ chặn người dùng này"
+
+#. TRANS: Button text for unblocking a user from a group.
+#: actions/blockedfromgroup.php:323
+msgctxt "BUTTON"
msgid "Unblock"
-msgstr "Bỏ chặn"
+msgstr ""
+#. TRANS: Tooltip for button for unblocking a user from a group.
#. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
+#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
msgid "Unblock this user"
msgstr "Bỏ chặn người dùng này"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
#: actions/bookmarklet.php:51
#, php-format
msgid "Post to %s"
msgstr "Trả lời cho %s"
-#: actions/confirmaddress.php:75
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+#: actions/confirmaddress.php:74
msgid "No confirmation code."
msgstr "Không có mã số xác nhận."
+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
msgstr "Không tìm thấy mã xác nhận."
-#: actions/confirmaddress.php:85
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86
msgid "That confirmation code is not for you!"
msgstr "Mã xác nhận này không phải của bạn!"
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92
+#, fuzzy, php-format
+msgid "Unrecognized address type %s."
+msgstr "Không nhận dạng kiểu địa chỉ %s"
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
msgid "That address has already been confirmed."
msgstr "Địa chỉ đó đã được xác nhận rồi."
+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
#. TRANS: Server error thrown on database error updating e-mail preferences.
#. TRANS: Server error thrown on database error removing a registered e-mail address.
#. TRANS: Server error thrown on database error updating IM preferences.
#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:116 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:337
+#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "Không thể cập nhật thành viên."
-#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:437
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
-msgstr "Không thể xóa email xác nhận."
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+#: actions/confirmaddress.php:132
+msgid "Could not delete address confirmation."
+msgstr ""
-#: actions/confirmaddress.php:146
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
msgid "Confirm address"
msgstr "Đã xác nhận địa chỉ này."
-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
msgstr "Địa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
-#: actions/conversation.php:99
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96
msgid "Conversation"
msgstr "Thành phố"
-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Tin nhắn"
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Client error displayed trying to delete an application that does not exist.
#: actions/deleteapplication.php:71
msgid "Application not found."
msgstr "Không tìm thấy mã xác nhận."
-#: actions/deleteapplication.php:149
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#. TRANS: Client error text when there is a problem with the session token.
+#: actions/deleteapplication.php:102 actions/editapplication.php:131
+#: actions/newapplication.php:114 actions/showapplication.php:118
+#: lib/action.php:1409
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
+#, fuzzy
+msgid "Delete application"
+msgstr "Không có tin nhắn nào."
+
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
msgid ""
"Are you sure you want to delete this application? This will clear all data "
"about the application from the database, including all existing user "
"connections."
msgstr ""
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:161
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "Không thể xóa tin nhắn này."
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:167
+#, fuzzy
+msgid "Delete this application"
+msgstr "Xóa tin nhắn"
+
+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+msgid "You must be logged in to delete a group."
+msgstr ""
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No nickname or ID."
+msgstr "Không có biệt hiệu."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+msgid "You are not allowed to delete this group."
+msgstr ""
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, php-format
+msgid "Could not delete group %s."
+msgstr ""
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, php-format
+msgid "Deleted group %s"
+msgstr ""
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+msgid "Delete group"
+msgstr ""
+
+#. TRANS: Warning in form for deleleting a group.
+#: actions/deletegroup.php:206
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+msgid "Do not delete this group"
+msgstr ""
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+msgid "Delete this group"
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: 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/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "Chưa đăng nhập."
-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-msgstr "Không thể xóa tin nhắn này."
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
msgid "Delete notice"
msgstr "Xóa tin nhắn"
-#: actions/deletenotice.php:144
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
msgid "Are you sure you want to delete this notice?"
msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:159
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "Không thể xóa tin nhắn này."
+
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:166 lib/noticelist.php:672
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Xóa tin nhắn"
+
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "Bạn đã không xóa trạng thái của những người khác."
+
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
msgstr "Xóa"
@@ -721,77 +1629,187 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#, fuzzy
+msgid "Delete this user"
+msgstr "Xóa tin nhắn"
+
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
msgid "Design"
msgstr ""
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:335
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "Kích thước không hợp lệ."
+
+#: actions/designadminpanel.php:340
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#: actions/designadminpanel.php:344
+#, fuzzy, php-format
+msgid "Theme not available: %s."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#: actions/designadminpanel.php:448
msgid "Change logo"
msgstr "Thay đổi"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:453
+#, fuzzy
+msgid "Site logo"
+msgstr "Thư mời"
+
+#: actions/designadminpanel.php:457
+msgid "SSL logo"
+msgstr ""
+
+#: actions/designadminpanel.php:469
+#, fuzzy
+msgid "Change theme"
+msgstr "Thay đổi"
+
+#: actions/designadminpanel.php:486
+#, fuzzy
+msgid "Site theme"
+msgstr "Thông báo mới"
+
+#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:493
+#, fuzzy
+msgid "Custom theme"
+msgstr "Thông báo mới"
+
+#: actions/designadminpanel.php:497
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#, fuzzy
+msgid "Change background image"
+msgstr "Background Theme:"
+
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183
+#, fuzzy
+msgid "Background"
+msgstr "Background Theme:"
+
+#: actions/designadminpanel.php:522
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:553
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:570
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+#. TRANS: use of the uploaded profile image.
+#: actions/designadminpanel.php:571 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#, fuzzy
+msgid "Tile background image"
+msgstr "Background Theme:"
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#, fuzzy
+msgid "Change colours"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#, fuzzy
+msgid "Content"
+msgstr "Kết nối"
+
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#, fuzzy
+msgid "Sidebar"
+msgstr "Tìm kiếm"
+
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225
msgid "Text"
msgstr "Chuỗi bất kỳ"
-#: actions/designadminpanel.php:651
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#, fuzzy
+msgid "Links"
+msgstr "Đăng nhập"
+
+#: actions/designadminpanel.php:677
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:681
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357
msgid "Save"
msgstr "Lưu"
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#, fuzzy
+msgid "Save design"
+msgstr "Lưu"
+
+#: actions/disfavor.php:81
+#, fuzzy
+msgid "This notice is not a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
#: actions/disfavor.php:94
msgid "Add to favorites"
msgstr "Ưa thích"
@@ -801,49 +1819,144 @@ msgstr "Ưa thích"
msgid "No such document \"%s\""
msgstr "Không có tin nhắn nào."
-#: actions/editapplication.php:161
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+#: actions/editapplication.php:54 lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr ""
+
+#. TRANS: Client error displayed trying to edit an application while not logged in.
+#: actions/editapplication.php:66
+#, fuzzy
+msgid "You must be logged in to edit an application."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Không có tin nhắn nào."
+
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167
msgid "Use this form to edit your application."
msgstr ""
-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163
+#, fuzzy
+msgid "Name is required."
+msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+msgid "Name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166
+#, fuzzy
+msgid "Name 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."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172
+#, fuzzy
+msgid "Description is required."
+msgstr "Mô tả"
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208
msgid "Source URL is too long."
msgstr ""
-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Trang chủ không phải là URL"
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196
msgid "Organization is required."
msgstr ""
-#: actions/editapplication.php:209 actions/newapplication.php:194
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+msgid "Organization is too long (maximum 255 characters)."
+msgstr ""
+
+#: actions/editapplication.php:226 actions/newapplication.php:202
msgid "Organization homepage is required."
msgstr ""
-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214
msgid "Callback is too long."
msgstr ""
-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223
msgid "Callback URL is not valid."
msgstr ""
-#: actions/editgroup.php:56
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282
+#, fuzzy
+msgid "Could not update application."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#: actions/editgroup.php:55
#, php-format
msgid "Edit %s group"
msgstr "Hộp thư đi của %s"
-#: actions/editgroup.php:158
+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#: actions/editgroup.php:110 actions/editgroup.php:176
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#, fuzzy
+msgid "You must be an admin to edit the group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161
msgid "Use this form to edit the group."
msgstr ""
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "Địa chỉ email không đúng:%s"
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272
+#, fuzzy
+msgid "Could not update group."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/editgroup.php:279 classes/User_group.php:529
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "Không thể tạo favorite."
+
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296
+#, fuzzy
+msgid "Options saved."
+msgstr "Đã lưu các điều chỉnh."
+
#. TRANS: Title for e-mail settings.
#: actions/emailsettings.php:61
msgid "Email settings"
@@ -856,6 +1969,13 @@ msgstr "Các thiết lập cho Hồ sơ cá nhân"
msgid "Manage how you get email from %%site.name%%."
msgstr "Bạn nhận email từ %%site.name%% như thế nào."
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Địa chỉ email"
+
#. TRANS: Form note in e-mail settings form.
#: actions/emailsettings.php:112
msgid "Current confirmed email address."
@@ -881,6 +2001,26 @@ msgstr ""
"Đang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) "
"để nhận tin nhắn và lời hướng dẫn."
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
+#, fuzzy
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Thêm"
+
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
#: actions/emailsettings.php:151 actions/smssettings.php:171
@@ -899,79 +2039,99 @@ msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:172 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
+msgid "New"
+msgstr "Mới"
+
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:178
msgid "Email preferences"
msgstr "Địa chỉ email"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:184
+#: actions/emailsettings.php:186
msgid "Send me notices of new subscriptions through email."
msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:190
+#: actions/emailsettings.php:192
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
"thích của họ."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:197
+#: actions/emailsettings.php:199
msgid "Send me email when someone sends me a private message."
msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:205
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:211
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:218
msgid "I want to post notices by email."
msgstr "Tôi muốn đưa tin nhắn lên bằng email."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:225
msgid "Publish a MicroID for my email address."
msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:346
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Các tính năng đã được lưu."
+
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:357
+#: actions/emailsettings.php:366
msgid "No email address."
msgstr "Không có địa chỉ email."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:365
+#: actions/emailsettings.php:374
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa Jabber ID"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:370 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Địa chỉ email không hợp lệ."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:383
msgid "That is already your email address."
msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:378
+#: actions/emailsettings.php:387
msgid "That email address already belongs to another user."
msgstr "Jabber ID này đã thuộc về người khác rồi."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:395 actions/imsettings.php:351
+#: actions/emailsettings.php:404 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Không thể chèn mã xác nhận."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:402
+#: actions/emailsettings.php:411
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -982,32 +2142,59 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:423 actions/imsettings.php:386
+#: actions/emailsettings.php:432 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Sự xác nhận chưa được hủy bỏ."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:437
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "Sai IM."
+
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/emailsettings.php:446 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "Không thể xóa email xác nhận."
+
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:451
msgid "Email confirmation cancelled."
msgstr "Sự xác nhận chưa được hủy bỏ."
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:471
+#, fuzzy
+msgid "That is not your email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:492
msgid "The email address was removed."
msgstr "Không có địa chỉ email."
-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:506 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Không có địa chỉ email."
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/smssettings.php:578 actions/smssettings.php:602
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr "Không thể cập nhật thành viên."
+
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:512 actions/smssettings.php:581
+#: actions/emailsettings.php:521 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Không có địa chỉ email."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:536 actions/smssettings.php:605
+#: actions/emailsettings.php:545 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Không có địa chỉ email."
@@ -1015,11 +2202,26 @@ msgstr "Không có địa chỉ email."
msgid "This notice is already a favorite!"
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: actions/favor.php:92 lib/disfavorform.php:144
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Không thích"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:62
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "Không có tin nhắn nào."
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "Các tin nhắn bị cảnh báo"
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "Các từ khóa phổ biến."
+
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
@@ -1038,7 +2240,7 @@ msgid ""
msgstr ""
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118
#, php-format
msgid "%s's favorite notices"
msgstr "Những tin nhắn ưa thích của %s"
@@ -1071,10 +2273,25 @@ msgstr "Không có tin nhắn nào."
msgid "No notice."
msgstr "Không có tin nhắn nào."
+#: actions/file.php:42
+#, fuzzy
+msgid "No attachments."
+msgstr "Không có tài liệu nào."
+
+#: actions/file.php:51
+#, fuzzy
+msgid "No uploaded attachments."
+msgstr "Không có tài liệu nào."
+
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
msgstr "Không mong đợi trả lời lại!"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "Người dùng đang lắng nghe để không thoát khỏi."
+
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
@@ -1087,21 +2304,67 @@ msgstr ""
msgid "You are not authorized."
msgstr "Đăng nhận được phép"
+#: actions/finishremotesubscribe.php:113
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
+
+#: actions/finishremotesubscribe.php:118
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Không biết phiên bản của giao thức OMB."
+
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#, fuzzy
+msgid "Error updating remote profile."
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "No such file."
+msgstr "Không có tin nhắn nào."
+
#: actions/getfile.php:83
msgid "Cannot read file."
msgstr "Không thể tạo favorite."
+#: actions/grantrole.php:62 actions/revokerole.php:62
+#, fuzzy
+msgid "Invalid role."
+msgstr "Kích thước không hợp lệ."
+
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
msgstr ""
+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/grantrole.php:82
+#, fuzzy
+msgid "User already has this role."
+msgstr "Người dùng không có thông tin."
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49
#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr ""
-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
+#: 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 đó."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:82
#: actions/makeadmin.php:81
msgid "No group specified."
msgstr ""
@@ -1110,6 +2373,16 @@ msgstr ""
msgid "Only an admin can block group members."
msgstr ""
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "Người dùng không có thông tin."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
#: actions/groupblock.php:134 actions/groupmembers.php:364
msgid "Block user from group"
msgstr "Chặn người dùng"
@@ -1122,6 +2395,18 @@ msgid ""
"the group in the future."
msgstr ""
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "Ban user"
+
#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1130,20 +2415,84 @@ msgstr ""
msgid "No ID."
msgstr "Không có Jabber ID."
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: actions/groupdesignsettings.php:144
+#, fuzzy
+msgid "Group design"
+msgstr "Nhóm"
+
#: actions/groupdesignsettings.php:155
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:405 lib/designsettings.php:427
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Các tính năng đã được lưu."
+
#: actions/grouplogo.php:142 actions/grouplogo.php:195
msgid "Group logo"
msgstr "Nhóm"
+#: actions/grouplogo.php:153
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Tải file"
+
+#: actions/grouplogo.php:289
+#, fuzzy
+msgid "Crop"
+msgstr "Nhóm"
+
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
msgstr ""
+#: actions/grouplogo.php:399
+#, fuzzy
+msgid "Logo updated."
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/grouplogo.php:401
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "Cập nhật hình đại diện không thành công."
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
+#, fuzzy, php-format
+msgid "%s group members"
+msgstr "Thành viên"
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
+#, fuzzy, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "Thành viên"
+
#: actions/groupmembers.php:122
msgid "A list of the users in this group."
msgstr ""
@@ -1158,6 +2507,17 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
+#: actions/groupmembers.php:498
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -1170,14 +2530,22 @@ msgctxt "TOOLTIP"
msgid "Make this user an admin"
msgstr ""
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr "Dòng tin công cộng"
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#, fuzzy
+msgid "Groups"
+msgstr "Nhóm"
+
+#: actions/groups.php:64
+#, fuzzy, php-format
+msgid "Groups, page %d"
+msgstr "Tên nhóm"
#: actions/groups.php:90
#, php-format
@@ -1189,6 +2557,31 @@ msgid ""
"%%%%)"
msgstr ""
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Tạo nhóm"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Tìm kiếm những người trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
+"họ. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
+
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "Tìm kiếm nhiều người"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "Không có kết quả nào"
+
#: actions/groupsearch.php:82
#, php-format
msgid ""
@@ -1203,10 +2596,23 @@ msgid ""
"action.newgroup%%) yourself!"
msgstr ""
-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94
msgid "Only an admin can unblock group members."
msgstr ""
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "Người dùng không có thông tin."
+
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86
+#, fuzzy
+msgid "Error removing the block."
+msgstr "Lỗi xảy ra khi lưu thành viên."
+
#. TRANS: Title for instance messaging settings.
#: actions/imsettings.php:60
msgid "IM settings"
@@ -1224,6 +2630,12 @@ msgstr ""
"Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk [tin nhắn nhanh]"
"(%%doc.im%%). Định dạng địa chỉ của bạn và các thiết lập sau."
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+#, fuzzy
+msgid "IM is not available."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
#. TRANS: Form legend for IM settings form.
#. TRANS: Field label for IM address input in IM settings form.
#: actions/imsettings.php:106 actions/imsettings.php:136
@@ -1287,7 +2699,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
#. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
msgid "Preferences saved."
msgstr "Các tính năng đã được lưu."
@@ -1332,6 +2744,12 @@ msgstr ""
msgid "That is the wrong IM address."
msgstr "Sai IM."
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:400
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Không thể xóa email xác nhận."
+
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:405
msgid "IM confirmation cancelled."
@@ -1343,6 +2761,17 @@ msgstr "Không có mã số xác nhận."
msgid "That is not your Jabber ID."
msgstr "Đây không phải Jabber ID của bạn."
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:450
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Đã xóa địa chỉ."
+
+#: actions/inbox.php:59
+#, fuzzy, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Hộp thư đến của %s"
+
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1352,51 +2781,72 @@ msgstr "Hộp thư đến của %s"
msgid "This is your inbox, which lists your incoming private messages."
msgstr "Đây là hộp thư đến của bạn, bao gồm các tin nhắn gửi đến riêng cho bạn"
-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40
msgid "Invites have been disabled."
msgstr ""
-#: actions/invite.php:41
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44
#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr "Bạn đã không xóa trạng thái của những người khác."
-#: actions/invite.php:72
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#: actions/invite.php:77
#, php-format
-msgid "Invalid email address: %s"
-msgstr "Địa chỉ email không đúng:%s"
+msgid "Invalid email address: %s."
+msgstr ""
-#: actions/invite.php:110
-msgid "Invitation(s) sent"
-msgstr "Thư mời đã gửi"
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+msgid "Invitations sent"
+msgstr ""
-#: actions/invite.php:112
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119
msgid "Invite new users"
msgstr "Gửi thư mời đến những người chưa có tài khoản"
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr "Bạn đã theo những người này:"
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+#: actions/invite.php:139
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] ""
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#: actions/invite.php:145 actions/invite.php:159
#, php-format
+msgctxt "INVITE"
msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgstr ""
-#: actions/invite.php:136
-msgid ""
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+#: actions/invite.php:153
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""
"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-"Những người này đã là thành viên rồi và bạn chỉ cần nhấn nút \"Tôi theo "
-"người này\" để theo họ:"
+msgstr[0] ""
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr "Thư mời đã gửi đến:"
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+#: actions/invite.php:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
-#: actions/invite.php:150
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177
msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
@@ -1404,38 +2854,56 @@ msgstr ""
"Bạn sẽ nhận được thông báo khi những người được bạn mời nhận lời mời và đăng "
"ký vào trang web này. Cảm ơn bạn "
-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217
msgid "Email addresses"
msgstr "Địa chỉ email"
-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220
msgid "Addresses of friends to invite (one per line)"
msgstr ""
"Các địa chỉ email của những người bạn muốn mời (mỗi địa chỉ nằm trên 1 dòng)"
-#: actions/invite.php:192
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224
msgid "Personal message"
msgstr "Tin nhắn cá nhân"
-#: actions/invite.php:194
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227
msgid "Optionally add a personal message to the invitation."
msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:231
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Gửi"
+
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#: actions/invite.php:263
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s moi ban tham gia vao %2$s"
-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:231
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
+#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
+#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
+#. TRANS: to register with the StatusNet site.
+#: actions/invite.php:270
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -1492,11 +2960,137 @@ msgstr ""
"\n"
"Thân, %2$s\n"
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: actions/joingroup.php:141
+#, fuzzy, php-format
+msgid "%1$s joined group %2$s"
+msgstr "%s và nhóm"
+
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
#: actions/leavegroup.php:137
#, php-format
msgid "%1$s left group %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+#, fuzzy
+msgid "Private"
+msgstr "Riêng tư"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Đã đăng nhập."
@@ -1505,6 +3099,11 @@ msgstr "Đã đăng nhập."
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
+#: 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:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
@@ -1513,11 +3112,11 @@ msgstr "Đăng nhập"
msgid "Login to site"
msgstr ""
-#: actions/login.php:258 actions/register.php:485
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:259 actions/register.php:487
+#: actions/login.php:259 actions/register.php:493
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!"
@@ -1533,53 +3132,127 @@ 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: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:295
+#, fuzzy, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
+"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
+"bằng [OpenID](%%action.openidlogin%%). "
+
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/newapplication.php:143
+#: actions/makeadmin.php:96
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "Người dùng không có thông tin."
+
+#: actions/makeadmin.php:133
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: actions/makeadmin.php:146
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: actions/microsummary.php:69
+#, fuzzy
+msgid "No current status."
+msgstr "Không có kết quả nào"
+
+#. TRANS: This is the title of the form for adding a new application.
+#: actions/newapplication.php:52
+msgid "New application"
+msgstr ""
+
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+#: actions/newapplication.php:65
+#, fuzzy
+msgid "You must be logged in to register an application."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: actions/newapplication.php:147
msgid "Use this form to register a new application."
msgstr ""
-#: actions/newapplication.php:176
+#: actions/newapplication.php:184
msgid "Source URL is required."
msgstr ""
+#: actions/newapplication.php:266 actions/newapplication.php:275
+#, fuzzy
+msgid "Could not create application."
+msgstr "Không thể tạo favorite."
+
+#. TRANS: Title for form to create a group.
+#: actions/newgroup.php:53
+#, fuzzy
+msgid "New group"
+msgstr "Tạo nhóm"
+
+#. TRANS: Form instructions for group create form.
#: actions/newgroup.php:110
msgid "Use this form to create a new group."
msgstr ""
-#: actions/newmessage.php:71 actions/newmessage.php:231
+#: actions/newmessage.php:71 actions/newmessage.php:234
msgid "New message"
msgstr "Tin nhắn cá nhân"
#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
msgid "You can't send a message to this user."
msgstr "Bạn chưa cập nhật thông tin riêng"
#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
+#: lib/command.php:581
msgid "No content!"
msgstr "Không có nội dung!"
-#: actions/newmessage.php:158
+#: actions/newmessage.php:161
msgid "No recipient specified."
msgstr ""
#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:167 lib/command.php:505
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr ""
+#: actions/newmessage.php:184
+#, fuzzy
+msgid "Message sent"
+msgstr "Tin mới nhất"
+
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:188 lib/command.php:513
+#, fuzzy, php-format
+msgid "Direct message to %s sent."
+msgstr "Tin nhắn riêng"
+
+#: actions/newmessage.php:213 actions/newnotice.php:264
+#, fuzzy
+msgid "Ajax Error"
+msgstr "Lỗi"
+
#: actions/newnotice.php:69
msgid "New notice"
msgstr "Thông báo mới"
-#: actions/newnotice.php:227
+#: actions/newnotice.php:230
msgid "Notice posted"
msgstr "Tin nhắn"
@@ -1615,6 +3288,11 @@ msgid ""
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+#: actions/noticesearchrss.php:96
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "Dòng tin nhắn cho %s"
+
#: actions/noticesearchrss.php:98
#, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
@@ -1622,100 +3300,195 @@ msgstr "Dòng tin nhắn cho %s"
#: actions/nudge.php:85
msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
msgstr ""
-#: actions/oauthappssettings.php:74
+#: actions/nudge.php:94
+#, fuzzy
+msgid "Nudge sent"
+msgstr "Tin đã gửi"
+
+#: actions/nudge.php:97
+#, fuzzy
+msgid "Nudge sent!"
+msgstr "Tin đã gửi"
+
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
+#, fuzzy
+msgid "You must be logged in to list your applications."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
msgid "OAuth applications"
msgstr ""
-#: actions/oauthappssettings.php:85
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
msgid "Applications you have registered"
msgstr ""
-#: actions/oauthappssettings.php:135
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
#, php-format
msgid "You have not registered any applications yet."
msgstr ""
-#: actions/oauthconnectionssettings.php:72
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
msgid "Connected applications"
msgstr ""
+#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "The following connections exist for your account."
msgstr ""
-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: actions/oauthconnectionssettings.php:168
+#, fuzzy
+msgid "You are not a user of that application."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#: actions/oauthconnectionssettings.php:183
#, php-format
-msgid "Unable to revoke access for app: %s."
+msgid "Unable to revoke access for application: %s."
msgstr ""
-#: actions/oauthconnectionssettings.php:198
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#: actions/oauthconnectionssettings.php:202
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213
msgid "You have not authorized any applications to use your account."
msgstr ""
-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#: actions/oauthconnectionssettings.php:233
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
msgstr ""
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
msgstr "Người dùng không có thông tin."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:83 actions/shownotice.php:172
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Trạng thái của %1$s vào %2$s"
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:168
+#, fuzzy, php-format
+msgid "Content type %s not supported."
+msgstr "Kết nối"
+
#. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:163
+#: actions/oembed.php:172
#, php-format
msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1356
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
+msgstr "Tìm kiếm nhiều người"
+
#: actions/opensearch.php:67
msgid "Notice Search"
msgstr "Tìm kiếm thông báo"
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
msgid "Other settings"
msgstr "Thay đổi hình đại diện"
+#. TRANS: Instructions for tab "Other" in user profile settings.
#: actions/othersettings.php:71
msgid "Manage various other options."
msgstr ""
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
msgid " (free service)"
msgstr ""
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
msgid "Shorten URLs with"
msgstr ""
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
msgid "Automatic shortening service to use."
msgstr ""
-#: actions/othersettings.php:123
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
+#, fuzzy
+msgid "View profile designs"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
msgid "Show or hide profile designs."
msgstr ""
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Thông báo mới"
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Thông báo mới"
+
#: actions/otp.php:90
msgid "No login token requested."
msgstr "Không có yêu cầu!"
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Nội dung tin nhắn không hợp lệ"
+
#: actions/otp.php:104
msgid "Login token expired."
msgstr ""
+#: actions/outbox.php:58
+#, fuzzy, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Hộp thư đi của %s"
+
#: actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
@@ -1731,6 +3504,16 @@ msgstr ""
msgid "Change password"
msgstr "Đổi mật khẩu"
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Đã lưu mật khẩu."
+
#: actions/passwordsettings.php:104
msgid "Old password"
msgstr "Mật khẩu cũ"
@@ -1744,7 +3527,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:440
+#: actions/register.php:441
msgid "Confirm"
msgstr "Xác nhận"
@@ -1756,7 +3539,12 @@ msgstr "Cùng mật khẩu ở trên"
msgid "Change"
msgstr "Thay đổi"
-#: actions/passwordsettings.php:157 actions/register.php:240
+#: actions/passwordsettings.php:154 actions/register.php:238
+#, 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:241
msgid "Passwords don't match."
msgstr "Mật khẩu không khớp."
@@ -1776,75 +3564,288 @@ msgstr "Không thể lưu mật khẩu mới"
msgid "Password saved."
msgstr "Đã lưu mật khẩu."
+#. TRANS: Title for Paths admin panel.
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
msgid "Paths"
msgstr ""
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69
+msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:183
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#: actions/pathsadminpanel.php:155
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.
+#: actions/pathsadminpanel.php:163
+#, fuzzy, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the background directory that could not be written to.
+#: actions/pathsadminpanel.php:171
+#, fuzzy, php-format
+msgid "Background directory not writable: %s."
+msgstr "Background Theme:"
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#: actions/pathsadminpanel.php:181
+#, fuzzy, php-format
+msgid "Locales directory not readable: %s."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+#: actions/pathsadminpanel.php:189
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:238
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
+#, fuzzy
+msgid "Site"
+msgstr "Thư mời"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
+#, fuzzy
+msgid "Server"
+msgstr "Khôi phục"
+
+#: actions/pathsadminpanel.php:242
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
+#: actions/pathsadminpanel.php:249
+msgid "Site path."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+msgid "Locale directory"
msgstr ""
-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#: actions/pathsadminpanel.php:256
+msgid "Directory path to locales."
msgstr ""
-#: actions/pathsadminpanel.php:250
+#. TRANS: Checkbox label in Paths admin panel.
+#: actions/pathsadminpanel.php:263
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:265
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:272
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+msgid "Server for themes."
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
+#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
+#, fuzzy
+msgid "SSL server"
+msgstr "Khôi phục"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
+#: actions/pathsadminpanel.php:452
+msgid "SSL path"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:308
+msgid "SSL path to themes (default: /theme/)."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
+#: actions/pathsadminpanel.php:461
+msgid "Directory"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:317
+msgid "Directory where themes are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:326
+#, fuzzy
+msgid "Avatars"
+msgstr "Hình đại diện"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333
+#, fuzzy
+msgid "Avatar server"
+msgstr "Thay đổi hình đại diện"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:335
+msgid "Server for avatars."
msgstr ""
-#: actions/pathsadminpanel.php:325
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:342
+#, fuzzy
+msgid "Avatar path"
+msgstr "Hình đại diện đã được cập nhật."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:344
+msgid "Web path to avatars."
+msgstr ""
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:351
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Hình đại diện đã được cập nhật."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:353
+msgid "Directory where avatars are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:364
+#, fuzzy
+msgid "Backgrounds"
+msgstr "Background Theme:"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+msgid "Server for backgrounds."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:399
+msgid "Web path to backgrounds on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:408
+msgid "Directory where backgrounds are located."
+msgstr ""
+
+#. TRANS: Fieldset legens in Paths admin panel.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+msgid "Attachments"
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:427
+msgid "Server for attachments."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:436
+msgid "Web path to attachments."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:445
+msgid "Server for attachments on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:454
+msgid "Web path to attachments on SSL pages."
+msgstr ""
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:463
+msgid "Directory where attachments are located."
+msgstr ""
+
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:472
+#, fuzzy
+msgid "SSL"
+msgstr "SMS"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
+#, fuzzy
+msgid "Never"
+msgstr "Khôi phục"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479
+#, fuzzy
+msgid "Sometimes"
+msgstr "Tin nhắn"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:481
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:485
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+msgid "When to use SSL."
msgstr ""
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:497
+msgid "Server to direct SSL requests to."
msgstr ""
+#. TRANS: Button title text to store form data in the Paths admin panel.
+#: actions/pathsadminpanel.php:514
+#, fuzzy
+msgid "Save paths"
+msgstr "Thông báo mới"
+
#: actions/peoplesearch.php:52
#, php-format
msgid ""
@@ -1858,6 +3859,16 @@ msgstr ""
msgid "People search"
msgstr "Tìm kiếm nhiều người"
+#: actions/peopletag.php:68
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s."
+msgstr "Địa chỉ email không hợp lệ."
+
+#: actions/peopletag.php:142
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr "Dòng tin nhắn cho %s"
+
#: actions/postnotice.php:95
msgid "Invalid notice content."
msgstr "Kích thước không hợp lệ."
@@ -1867,116 +3878,181 @@ msgstr "Kích thước không hợp lệ."
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/profilesettings.php:60
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61
msgid "Profile settings"
msgstr "Các thiết lập cho Hồ sơ cá nhân"
-#: actions/profilesettings.php:71
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
"về bạn."
-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102
msgid "Profile information"
msgstr "Các thiết lập cho Hồ sơ cá nhân"
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-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 "
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
msgstr "Tên đầy đủ"
+#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
-#: 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 "
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+msgid "URL of your homepage, blog, or profile on another site."
+msgstr ""
+
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#: actions/profilesettings.php:133 actions/register.php:472
+#, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477
+#, 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:473
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "Lý lịch"
-#: 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
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167
msgid "Location"
msgstr "Thành phố"
-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157
msgid "Share my current location when posting notices"
msgstr ""
-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212
msgid "Tags"
msgstr "Từ khóa"
-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173
msgid "Language"
msgstr "Ngôn ngữ"
-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175
msgid "Preferred language"
msgstr "Ngôn ngữ bạn thích"
-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185
msgid "Timezone"
msgstr "Khu vực"
-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187
msgid "What timezone are you normally in?"
msgstr "Khu vực nào bạn thường ở?"
-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193
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:230
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "Tên khu vực quá dài (không quá %d ký tự)."
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr ""
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr "Tên khu vực quá dài (không quá 50 ký tự)."
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+msgid "Language is too long (maximum 50 characters)."
+msgstr ""
-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profilesettings.php:295 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "Địa chỉ email không đúng:%s"
-#: actions/profilesettings.php:375
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
msgid "Couldn't save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "Đã lưu các điều chỉnh."
@@ -1985,10 +4061,35 @@ msgstr "Đã lưu các điều chỉnh."
msgid "Beyond the page limit (%s)."
msgstr ""
+#: actions/public.php:92
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
+
+#: actions/public.php:130
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "Dòng tin công cộng"
+
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
msgstr "Dòng tin công cộng"
+#: actions/public.php:160
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:164
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Dòng tin công cộng"
+
+#: actions/public.php:168
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Dòng tin công cộng"
+
#: actions/public.php:188
#, php-format
msgid ""
@@ -2023,28 +4124,46 @@ msgid ""
"tool."
msgstr ""
-#: actions/publictagcloud.php:63
+#. TRANS: Title for public tag cloud.
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "Dòng tin công cộng"
+
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#: actions/publictagcloud.php:65
#, php-format
-msgid "These are most popular recent tags on %s "
+msgid "These are most popular recent tags on %s"
msgstr ""
-#: actions/publictagcloud.php:69
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:74
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
-#: actions/publictagcloud.php:72
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#: actions/publictagcloud.php:79
msgid "Be the first to post one!"
msgstr ""
-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:87
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
-#: actions/publictagcloud.php:134
+#: actions/publictagcloud.php:146
msgid "Tag cloud"
msgstr ""
@@ -2076,10 +4195,29 @@ msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
msgid "Could not update user with confirmed email address."
msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký "
+"trong tài khoản của bạn."
+
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
msgstr ""
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
+
+#: actions/recoverpassword.php:191
+#, fuzzy
+msgid "Nickname or email address"
+msgstr "Nhập biệt hiệu hoặc email."
+
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
@@ -2142,14 +4280,14 @@ msgid "Unexpected password reset."
msgstr "Bất ngờ reset mật khẩu."
#: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
-msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
+msgid "Password must be 6 characters or more."
+msgstr ""
#: actions/recoverpassword.php:369
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:255
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "Lỗi xảy ra khi tạo thành viên."
@@ -2157,15 +4295,20 @@ 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:92 actions/register.php:196 actions/register.php:412
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr ""
+#: 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:119
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -2173,74 +4316,117 @@ msgstr "Đăng ký"
msgid "Registration not allowed."
msgstr "Đăng ký"
-#: actions/register.php:205
+#: actions/register.php:209
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:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "Địa chỉ email đã tồn tại."
-#: actions/register.php:250 actions/register.php:272
+#: actions/register.php:251 actions/register.php:273
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:350
+#: actions/register.php:351
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:432
+#: actions/register.php:433
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:437
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
-#: actions/register.php:441
+#: actions/register.php:442
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:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "Email"
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:447 actions/register.php:451
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:457
+#: actions/register.php:458
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:518
+#: actions/register.php:463
+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/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr ""
-#: actions/register.php:528
+#: actions/register.php:534
#, 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:532
+#: actions/register.php:538
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:535
+#: actions/register.php:541
msgid "All rights reserved."
msgstr ""
-#: actions/register.php:607
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:546
+#, 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:589
+#, fuzzy, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Chúc mừng, %s! Chào mừng bạn đến với %%%%site.name%%%%. Bây giờ bạn có "
+"thể...\n"
+"\n"
+"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn đầu tiên. \n"
+"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có thể gửi tin "
+"nhắn nhanh.\n"
+"* [Tìm kiếm người quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ là có thể "
+"chia sẻ niềm vui.\n"
+"* Đọc xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm về dịch vụ của "
+"chúng tôi.\n"
+"\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:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -2285,7 +4471,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: lib/userprofile.php:411
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -2293,24 +4479,59 @@ msgstr "Theo bạn này"
msgid "Invalid profile URL (bad format)"
msgstr "URL hồ sơ cá nhân không đúng định dạng."
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là "
+
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
msgstr ""
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Không thể lấy token yêu cầu."
+
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "Thông báo mới"
+
+#: actions/repeat.php:76
+#, fuzzy
+msgid "You can't repeat your own notice."
+msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
+
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/repeat.php:114 lib/noticelist.php:691
msgid "Repeated"
msgstr "Khởi tạo"
+#: actions/repeat.php:119
+#, fuzzy
+msgid "Repeated!"
+msgstr "Tạo"
+
#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:108
#, php-format
msgid "Replies to %s"
msgstr "Trả lời cho %s"
+#: actions/replies.php:128
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%s chào mừng bạn "
+
#: actions/replies.php:145
#, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -2352,10 +4573,30 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "%s chào mừng bạn "
+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/revokerole.php:82
+#, fuzzy
+msgid "User doesn't have this role."
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+
#: actions/rsd.php:146 actions/version.php:159
msgid "StatusNet"
msgstr "Số liệu thống kê"
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "Người dùng không có thông tin."
+
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:379
@@ -2363,7 +4604,7 @@ msgid "Sessions"
msgstr ""
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:175
@@ -2382,18 +4623,47 @@ msgstr ""
msgid "Turn on debugging output for sessions."
msgstr ""
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#, fuzzy
+msgid "Save site settings"
+msgstr "Thay đổi hình đại diện"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Tin nhắn không có hồ sơ cá nhân"
+
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:173
msgid "Icon"
msgstr ""
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "Biệt danh"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "Thư mời đã gửi"
+
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:207 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
msgid "Description"
msgstr "Mô tả"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Số liệu thống kê"
@@ -2411,6 +4681,11 @@ msgstr ""
msgid "Reset key & secret"
msgstr ""
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:672
+msgid "Delete"
+msgstr "Xóa"
+
#: actions/showapplication.php:261
msgid "Application info"
msgstr ""
@@ -2441,6 +4716,16 @@ msgid ""
"signature method."
msgstr ""
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Những tin nhắn ưa thích của %s"
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Không thể lấy lại các tin nhắn ưa thích"
@@ -2485,54 +4770,106 @@ msgstr ""
msgid "This is a way to share what you like."
msgstr ""
-#: actions/showgroup.php:82
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75
#, php-format
msgid "%s group"
msgstr "Hộp thư đi của %s"
-#: actions/showgroup.php:227
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#: actions/showgroup.php:79
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Thành viên"
+
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220
msgid "Group profile"
msgstr "Người dùng không có thông tin."
-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180
msgid "URL"
msgstr ""
-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197
+#, fuzzy
+msgid "Note"
+msgstr "Tin nhắn"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:302
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304
msgid "Group actions"
msgstr "Không tìm thấy nhóm."
-#: actions/showgroup.php:338
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Chọn những người bạn của %s"
-#: actions/showgroup.php:344
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Chọn những người bạn của %s"
-#: actions/showgroup.php:355
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Dòng tin nhắn cho %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365
#, php-format
msgid "FOAF for %s group"
msgstr "Hộp thư đi của %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402
msgid "Members"
msgstr "Thành viên"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
-#: actions/showgroup.php:455
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417
+#, fuzzy
+msgid "All members"
+msgstr "Thành viên"
+
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+msgctxt "LABEL"
+msgid "Created"
+msgstr ""
+
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+msgctxt "LABEL"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:476
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2542,7 +4879,10 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#: actions/showgroup.php:486
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2551,57 +4891,118 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515
msgid "Admins"
msgstr ""
-#: actions/showmessage.php:81
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79
msgid "No such message."
msgstr "Không có tin nhắn nào."
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+#: actions/showmessage.php:97
+#, fuzzy
+msgid "Only the sender and recipient may read this message."
+msgstr "Chỉ có người gửi hoặc người nhận mới có thể xem tin nhắn này"
+
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:110
+#, fuzzy, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "%s chào mừng bạn "
+
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118
+#, fuzzy, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "%s chào mừng bạn "
+
#: actions/shownotice.php:90
msgid "Notice deleted."
msgstr "Không có mã nào được nhập"
-#: actions/showstream.php:122
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, php-format
+msgid "%1$s tagged %2$s"
+msgstr ""
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s và bạn bè"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
msgstr "Chọn những người bạn của %s"
-#: actions/showstream.php:129
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
msgstr "Chọn những người bạn của %s"
-#: actions/showstream.php:136
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
msgstr "Chọn những người bạn của %s"
-#: actions/showstream.php:143
+#: actions/showstream.php:152
#, php-format
msgid "Notice feed for %s (Atom)"
msgstr "Chọn những người bạn của %s"
-#: actions/showstream.php:200
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Hộp thư đi của %s"
+
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
msgstr ""
-#: actions/showstream.php:205
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:207
+#. TRANS: Second sentence of empty list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
"%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2610,7 +5011,9 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2618,6 +5021,22 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "Trả lời cho %s"
+
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "Người dùng không có thông tin."
+
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
msgstr ""
@@ -2626,6 +5045,11 @@ msgstr ""
msgid "Site name must have non-zero length."
msgstr ""
+#: actions/siteadminpanel.php:141
+#, fuzzy
+msgid "You must have a valid contact email address."
+msgstr "Địa chỉ email không hợp lệ."
+
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
@@ -2643,6 +5067,11 @@ msgstr ""
msgid "General"
msgstr ""
+#: actions/siteadminpanel.php:224
+#, fuzzy
+msgid "Site name"
+msgstr "Thông báo mới"
+
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
@@ -2663,6 +5092,16 @@ msgstr ""
msgid "URL used for credits link in footer of each page"
msgstr ""
+#: actions/siteadminpanel.php:239
+#, fuzzy
+msgid "Contact email address for your site"
+msgstr "Dia chi email moi de gui tin nhan den %s"
+
+#: actions/siteadminpanel.php:245
+#, fuzzy
+msgid "Local"
+msgstr "Thành phố"
+
#: actions/siteadminpanel.php:256
msgid "Default timezone"
msgstr ""
@@ -2671,6 +5110,11 @@ msgstr ""
msgid "Default timezone for the site; usually UTC."
msgstr ""
+#: actions/siteadminpanel.php:262
+#, fuzzy
+msgid "Default language"
+msgstr "Ngôn ngữ bạn thích"
+
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
@@ -2695,23 +5139,40 @@ msgstr ""
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
msgid "Site Notice"
msgstr "Tin nhắn"
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
+#, fuzzy
+msgid "Edit site-wide message"
+msgstr "Tin mới nhất"
+
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
msgstr ""
+#. TRANS: Label for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
msgstr "Xóa tin nhắn"
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
msgstr ""
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
msgid "Save site notice"
msgstr "Xóa tin nhắn"
@@ -2727,6 +5188,12 @@ msgstr "Thay đổi hình đại diện"
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận."
+
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
msgid "SMS address"
@@ -2737,11 +5204,30 @@ msgstr "Địa chỉ email"
msgid "Current confirmed SMS-enabled phone number."
msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
+#, fuzzy
+msgid "Awaiting confirmation on this phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Không có mã số xác nhận."
+
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Xác nhận"
+
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
msgid "SMS phone number"
@@ -2766,16 +5252,50 @@ msgstr ""
"Hãy gửi thông báo đến tôi qua SMS; Tôi biết là bạn đang phải trả giá cao "
"cho dịch vụ của chúng tôi. "
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Các tính năng đã được lưu."
+
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
msgid "No phone number."
msgstr "Không có số điện thoại."
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+#, fuzzy
+msgid "No carrier selected."
+msgstr "Bạn chưa chọn hình để đưa lên."
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "Jabber ID này đã thuộc về người khác rồi."
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
+"làm theo hướng dẫn."
+
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Đó không phải là số điện thoại của bạn."
+
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
msgid "SMS confirmation cancelled."
@@ -2787,6 +5307,18 @@ msgstr "Xác nhận SMS"
msgid "That is not your phone number."
msgstr "Đó không phải là số điện thoại của bạn."
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Số điện thoại để nhắn SMS "
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "Chọn nhà cung cấp Mobile"
+
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
msgid "Select a carrier"
@@ -2863,12 +5395,19 @@ msgstr ""
msgid "Snapshots will be sent to this URL"
msgstr ""
-#: actions/subedit.php:70
+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "Thay đổi hình đại diện"
+
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+#: actions/subedit.php:75
msgid "You are not subscribed to that profile."
msgstr "Bạn đã theo những người này:"
+#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:83 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:136
msgid "Could not save subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -2876,43 +5415,106 @@ msgstr "Không thể chèn thêm vào đăng nhận."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribers.php:63
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Không có tin nhắn nào."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/subscribe.php:145
+#, fuzzy
+msgid "Subscribed"
+msgstr "Theo bạn này"
+
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#: actions/subscribers.php:51
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Bạn này theo tôi"
+
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#: actions/subscribers.php:55
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "Theo tôi"
+
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+#: actions/subscribers.php:68
msgid "These are the people who listen to your notices."
msgstr "Có nhiều người nghe theo lời nhắn của bạn."
-#: actions/subscribers.php:67
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscribers.php:74
#, php-format
msgid "These are the people who listen to %s's notices."
msgstr "Có nhiều người nghe theo lời nhắn của %s."
-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
+"return the favor."
msgstr ""
-#: actions/subscribers.php:110
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#: actions/subscribers.php:120
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr ""
-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscribers.php:129
#, php-format
msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
-#: actions/subscriptions.php:65
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tất cả đăng nhận"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: actions/subscriptions.php:55
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "Tất cả đăng nhận"
+
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+#: actions/subscriptions.php:68
msgid "These are the people whose notices you listen to."
msgstr "Có nhiều người gửi lời nhắn để bạn nghe theo."
-#: actions/subscriptions.php:69
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscriptions.php:74
#, php-format
msgid "These are the people whose notices %s listens to."
msgstr "Có nhiều người gửi lời nhắn để %s nghe theo."
-#: actions/subscriptions.php:126
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscriptions.php:135
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -2922,12 +5524,23 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: actions/subscriptions.php:143 actions/subscriptions.php:149
#, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:226
+#, fuzzy
+msgid "Jabber"
+msgstr "Không có Jabber ID."
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:241
msgid "SMS"
msgstr "SMS"
@@ -2951,15 +5564,30 @@ msgstr "Chọn những người bạn của %s"
msgid "Notice feed for tag %s (Atom)"
msgstr "Chọn những người bạn của %s"
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No ID argument."
+msgstr "Không có tài liệu nào."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Từ khóa"
+
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "Người dùng không có thông tin."
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:103
+#: lib/userprofile.php:107
msgid "Photo"
msgstr ""
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Từ khóa"
+
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -2971,14 +5599,44 @@ msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Không có tin nhắn nào."
+
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "Người dùng không có thông tin."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "Người dùng không có thông tin."
+
#: actions/unsubscribe.php:77
msgid "No profile ID in request."
msgstr "Không có yêu cầu!"
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Hết theo"
+
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
msgid ""
@@ -2986,59 +5644,117 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:58
msgctxt "TITLE"
msgid "User"
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
+#: actions/useradminpanel.php:166
#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
-#: lib/personalgroupnav.php:109
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112
msgid "Profile"
msgstr "Hồ sơ "
-#: actions/useradminpanel.php:222
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "Gửi thư mời đến những người chưa có tài khoản"
+
+#. TRANS: Field label in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+msgid "Welcome text for new users (maximum 255 characters)."
msgstr ""
-#: actions/useradminpanel.php:258
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
+#, fuzzy
+msgid "Default subscription"
+msgstr "Tất cả đăng nhận"
+
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Tự động theo những người nào đăng ký theo tôi"
+
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations"
+msgstr "Thư mời đã gửi"
+
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Thư mời đã gửi"
+
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
msgid "Whether to allow users to invite new users."
msgstr ""
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Đăng nhận cho phép"
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
+"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
+"của họ, hãy nhấn \"Hủy bỏ\""
+
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr ""
@@ -3067,10 +5783,31 @@ msgstr "Không có yêu cầu!"
msgid "Subscription authorized"
msgstr "Đăng nhận được phép"
+#: actions/userauthorization.php:256
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"Đăng nhận được phép, nhưng URL trả lại không được gởi trả. Hãy kiểm tra các "
+"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. Đăng nhận token "
+"của bạn là:"
+
#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "Đăng nhận từ chối"
+#: actions/userauthorization.php:268
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"Đăng nhận này đã bị từ chối, nhưng không có URL nào để quay về. Hãy kiểm tra "
+"các hướng dẫn chi tiết trên site để "
+
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
@@ -3096,7 +5833,24 @@ msgstr ""
msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "Không thể đọc URL cho hình đại diện '%s'"
+
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "Kiểu file ảnh không phù hợp với '%s'"
+
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#, fuzzy
+msgid "Profile design"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
@@ -3106,15 +5860,42 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Thành viên"
+
#: actions/usergroups.php:132
msgid "Search for more groups"
msgstr ""
+#: actions/usergroups.php:159
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:75
+#, fuzzy, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/version.php:75
+#, fuzzy, php-format
+msgid "StatusNet %s"
+msgstr "Số liệu thống kê"
+
#: actions/version.php:155
#, php-format
msgid ""
@@ -3153,61 +5934,150 @@ msgstr ""
msgid "Plugins"
msgstr ""
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:885
+#, fuzzy
+msgid "Version"
+msgstr "Cá nhân"
+
#: actions/version.php:199
msgid "Author(s)"
msgstr ""
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+#, fuzzy
+msgid "Favor"
+msgstr "Ưa thích"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
+#, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:143
+#: classes/File.php:156
#, php-format
msgid "Cannot process URL '%s'"
msgstr ""
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:188
msgid "Robin thinks something is impossible."
msgstr ""
#. TRANS: Message given if an upload is larger than the configured maximum.
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204
#, php-format
msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""
"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
-msgstr ""
+msgstr[0] ""
#. TRANS: Message given if an upload would exceed user quota.
-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217
#, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] ""
#. TRANS: Message given id an upload would exceed a user's monthly quota.
-#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:211
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229
#, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Kích thước không hợp lệ."
#. TRANS: Exception thrown when joining a group fails.
#: classes/Group_member.php:42
msgid "Group join failed."
msgstr "Không tìm thấy nhóm."
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:55
+#, fuzzy
+msgid "Not part of group."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:63
+#, fuzzy
+msgid "Group leave failed."
+msgstr "Thông tin nhóm"
+
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr ""
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Đăng nhập"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42
+#, fuzzy
+msgid "Could not update local group."
+msgstr "Không thể cập nhật thành viên."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Không thể tạo favorite."
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
msgstr ""
#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
+#: classes/Message.php:45
msgid "You are banned from sending direct messages."
msgstr "Thư đến của bạn"
+#. TRANS: Message given when a message could not be stored on the server.
+#: classes/Message.php:62
+#, fuzzy
+msgid "Could not insert message."
+msgstr "Không thể chèn thêm vào đăng nhận."
+
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
+#: classes/Message.php:73
msgid "Could not update message with new URI."
msgstr "Không thể cập nhật thành viên."
@@ -3224,6 +6094,18 @@ msgstr ""
msgid "Database error inserting hashtag: %s"
msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:265
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+#: classes/Notice.php:270
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
#: classes/Notice.php:276
msgid ""
@@ -3249,36 +6131,86 @@ msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:909
+msgid "Bad type provided to saveKnownGroups."
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:1008
+#, fuzzy
+msgid "Problem saving group inbox."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1122
+#, php-format
+msgid "Could not save reply for %1$d, %2$d."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1853
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:172 classes/User_group.php:247
+#, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr ""
+
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:737
+#: classes/Profile.php:845
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:746
+#: classes/Profile.php:854
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "Người dùng không có thông tin."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:338
+#, fuzzy
+msgid "Unable to save tag."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:466
+#: classes/Subscription.php:75 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+#: classes/Subscription.php:80
+#, fuzzy
+msgid "Already subscribed!"
+msgstr "Chưa đăng nhận!"
+
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Người dùng không có thông tin."
+
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Chưa đăng nhận!"
+
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
#: classes/Subscription.php:178
msgid "Could not delete self-subscription."
@@ -3294,46 +6226,92 @@ msgstr "Không thể chèn thêm vào đăng nhận."
msgid "Could not delete subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr ""
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
+#, php-format
+msgid "%1$s is now following %2$s."
+msgstr ""
+
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#: classes/User.php:395
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%s chào mừng bạn "
+
+#. TRANS: Server exception.
+#: classes/User.php:923
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:927
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:511
+#, fuzzy
+msgid "Could not create group."
+msgstr "Không thể tạo favorite."
+
#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
+#: classes/User_group.php:521
msgid "Could not set group URI."
msgstr "Không thể lưu hồ sơ cá nhân."
#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
+#: classes/User_group.php:544
msgid "Could not set group membership."
msgstr "Không thể cập nhật thành viên."
#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:559
msgid "Could not save local group info."
msgstr "Không thể lưu hồ sơ cá nhân."
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104
msgid "Change your profile settings"
msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:111
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Cập nhật hình đại diện không thành công."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:118
msgid "Change your password"
msgstr "Thay đổi mật khẩu của bạn"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125
msgid "Change email handling"
msgstr "Đang thực hiện việc thay đổi email"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132
msgid "Design your profile"
msgstr "Người dùng không có thông tin."
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139
msgid "Other options"
msgstr ""
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:141
+msgid "Other"
+msgstr "Khác"
+
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:148
#, php-format
@@ -3345,149 +6323,338 @@ msgstr "Trạng thái của %1$s vào %2$s"
msgid "Untitled page"
msgstr ""
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:531
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:537
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:540
+#, fuzzy
+msgctxt "MENU"
+msgid "Personal"
+msgstr "Cá nhân"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:542
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Change your email, avatar, password, profile"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#. TRANS: Main menu option when logged in for access to user settings
+#: lib/action.php:545
+msgid "Account"
+msgstr "Tài khoản"
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:547
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+msgstr "Không thể chuyển đến máy chủ: %s"
+
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:468
+#: lib/action.php:550
msgid "Connect"
msgstr "Kết nối"
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:553
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Change site configuration"
+msgstr "Tôi theo"
+
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:474 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr ""
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:560
+#, fuzzy, php-format
+msgctxt "TOOLTIP"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
+"của bạn tham gia vào dịch vụ này."
+
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:563
+#, fuzzy
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Thư mời"
+
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:487
+#: lib/action.php:569
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:572
+#, fuzzy
+msgctxt "MENU"
+msgid "Logout"
+msgstr "Thoát"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:577
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "Tạo tài khoản mới"
+
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:580
+msgctxt "MENU"
+msgid "Register"
+msgstr "Đăng ký"
+
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:501
+#: lib/action.php:583
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:510
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Đăng nhập"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:589
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Hướng dẫn"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592
msgctxt "MENU"
msgid "Help"
msgstr "Trợ giúp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:595
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: lib/action.php:598
+#, fuzzy
+msgctxt "MENU"
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:620 lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "Thông báo mới"
+
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:605
+#: lib/action.php:687
msgid "Local views"
msgstr ""
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:757
+#, fuzzy
+msgid "Page notice"
+msgstr "Thông báo mới"
+
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:858
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "Tôi theo"
+
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:864
msgid "Help"
msgstr "Hướng dẫn"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:787
+#: lib/action.php:867
msgid "About"
msgstr "Giới thiệu"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:870
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:875
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:799
+#: lib/action.php:879
msgid "Privacy"
msgstr "Riêng tư"
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:882
msgid "Source"
msgstr "Nguồn"
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:808
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:889
msgid "Contact"
msgstr "Liên hệ"
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892
+#, fuzzy
+msgid "Badge"
+msgstr "Tin đã gửi"
+
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:921
msgid "StatusNet software license"
msgstr ""
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:928
+#, fuzzy, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
+"%](%%site.broughtbyurl%%). "
+
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:849
+#: lib/action.php:931
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn."
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:938
+#, fuzzy, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Đang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
+"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
+"licenses/agpl-3.0.html)."
+
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:954
+#, fuzzy
+msgid "Site content license"
+msgstr "Tìm theo nội dung của tin nhắn"
+
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:879
+#: lib/action.php:961
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:886
+#: lib/action.php:968
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:890
+#: lib/action.php:972
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
#. TRANS: license message in footer.
#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:904
+#: lib/action.php:1004
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1340
+#, fuzzy
+msgid "Pagination"
+msgstr "Đăng ký"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1351
+#, fuzzy
+msgid "After"
+msgstr "Sau"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1361
+#, fuzzy
+msgid "Before"
+msgstr "Trước"
+
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: lib/activity.php:120
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
#. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:203
+#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
msgstr ""
#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:240
+#: lib/activityutils.php:237
msgid "Can't handle embedded XML content yet."
msgstr ""
#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:245
+#: lib/activityutils.php:242
msgid "Can't handle embedded Base64 content yet."
msgstr ""
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Bạn đã theo những người này:"
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+#: lib/adminpanelaction.php:108
+#, fuzzy
+msgid "Changes to that panel are not allowed."
+msgstr "Biệt hiệu không được cho phép."
+
#. TRANS: Client error message.
#: lib/adminpanelaction.php:222
msgid "showForm() not implemented."
@@ -3498,189 +6665,372 @@ msgstr ""
msgid "saveSettings() not implemented."
msgstr ""
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:274
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Xac nhan dia chi email"
+
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:339
+#, fuzzy
+msgctxt "MENU"
+msgid "Site"
+msgstr "Thư mời"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+#, fuzzy
+msgid "Design configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item for site administration
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+#, fuzzy
+msgctxt "MENU"
+msgid "Design"
+msgstr "Cá nhân"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:353
+#, fuzzy
+msgid "User configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
msgid "User"
msgstr ""
#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+#, fuzzy
+msgid "Access configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:377
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:385
msgid "Edit site notice"
msgstr "Xóa tin nhắn"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:393
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "Xác nhận SMS"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:175
+#: lib/apiauth.php:177
msgid "No application for that consumer key."
msgstr ""
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:212
+#: lib/apiauth.php:219
msgid "Bad access token."
msgstr ""
#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:217
+#: lib/apiauth.php:224
msgid "No user for that token."
msgstr ""
#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
#. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:258 lib/apiauth.php:290
+#: lib/apiauth.php:266 lib/apiauth.php:293
msgid "Could not authenticate you."
msgstr ""
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/apioauthstore.php:45
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/apioauthstore.php:69
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/apioauthstore.php:151
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/apioauthstore.php:186
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
+
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:285
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:182
+#: lib/apioauthstore.php:290
msgid "Failed to delete revoked token."
msgstr ""
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr ""
-
#. TRANS: Form guide.
#: lib/applicationeditform.php:178
msgid "Icon for this application"
msgstr ""
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:204
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:205
msgid "Describe your application"
msgstr "Mô tả"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:216
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "Source URL"
+msgstr "Nguồn"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:225
msgid "Organization responsible for this application"
msgstr ""
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:234
+#, fuzzy
+msgid "URL for the homepage of the organization"
+msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:243
msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:271
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:288
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:290
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:314
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:334
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:336
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:353
msgid "Cancel"
msgstr "Hủy"
+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+
#. TRANS: Application access type
-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:260
msgid "read-write"
msgstr ""
#. TRANS: Application access type
-#: lib/applicationlist.php:137
+#: lib/applicationlist.php:262
msgid "read-only"
msgstr ""
-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:143
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:268
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
msgstr ""
+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#: lib/applicationlist.php:282
+#, php-format
+msgid "Access token starting with: %s"
+msgstr ""
+
#. TRANS: Button label
-#: lib/applicationlist.php:158
+#: lib/applicationlist.php:298
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Khôi phục"
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
msgstr ""
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:294
msgid "Author"
msgstr ""
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:308
msgid "Provider"
msgstr "Xem trước"
#. TRANS: Title.
-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
msgstr ""
#. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:49
+#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
msgstr ""
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+msgid "Password changing failed."
+msgstr ""
+
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+msgid "Password changing is not allowed."
+msgstr ""
+
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+#, fuzzy
+msgid "Block"
+msgstr "Chặn người dùng"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
+#, fuzzy
+msgid "Command results"
+msgstr "Không có kết quả nào"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
msgid "Command complete"
msgstr ""
-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
msgid "Command failed"
msgstr "Bạn và bạn bè"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:82 lib/command.php:106
+#, fuzzy
+msgid "Notice with that id does not exist."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:99 lib/command.php:630
+#, fuzzy
+msgid "User has no last notice."
+msgstr "Người dùng không có thông tin."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:128
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:150
+#: lib/command.php:148
#, php-format
msgid "Could not find a local user with nickname %s."
msgstr ""
#. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:185
+#: lib/command.php:183
msgid "Sorry, this command is not yet implemented."
msgstr ""
#. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:231
+#: lib/command.php:229
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:238
+#, fuzzy, php-format
+msgid "Nudge sent to %s."
+msgstr "Tin đã gửi"
+
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
#. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:270
+#: lib/command.php:268
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -3688,152 +7038,241 @@ msgid ""
"Notices: %3$s"
msgstr ""
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312
+#, fuzzy
+msgid "Notice marked as fave."
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:360
+#: lib/command.php:357
#, php-format
msgid "%1$s joined group %2$s."
msgstr ""
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:408
+#: lib/command.php:405
#, php-format
msgid "%1$s left group %2$s."
msgstr ""
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:430
+#, fuzzy, php-format
+msgid "Fullname: %s"
+msgstr "Tên đầy đủ"
+
#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a location.
+#: lib/command.php:434 lib/mail.php:278
#, php-format
msgid "Location: %s"
msgstr "Thành phố"
#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:442 lib/mail.php:271
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a homepage.
+#: lib/command.php:438 lib/mail.php:282
#, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog"
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:442
+#, fuzzy, php-format
+msgid "About: %s"
+msgstr "Giới thiệu"
+
#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488
#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:516
+#, fuzzy
+msgid "Error sending direct message."
+msgstr "Thư bạn đã gửi"
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, fuzzy, php-format
+msgid "Notice from %s repeated."
+msgstr "Tin đã gửi"
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:557
+#: lib/command.php:556
msgid "Error repeating notice."
msgstr "Lỗi xảy ra khi tạo thành viên."
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:591
#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:604
+#, fuzzy, php-format
+msgid "Reply to %s sent."
+msgstr "Trả lời tin nhắn này"
+
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:607
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:654
msgid "Specify the name of the user to subscribe to."
msgstr ""
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:663
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
#. TRANS: Text shown after having subscribed to another user successfully.
#. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:671
#, php-format
msgid "Subscribed to %s."
msgstr ""
#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:692 lib/command.php:803
msgid "Specify the name of the user to unsubscribe from."
msgstr ""
#. TRANS: Text shown after having unsubscribed from another user successfully.
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:703
#, php-format
msgid "Unsubscribed from %s."
msgstr ""
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:723 lib/command.php:749
msgid "Command not yet implemented."
msgstr ""
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+#, fuzzy
+msgid "Notification off."
+msgstr "Không có mã số xác nhận."
+
#. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:730
msgid "Can't turn off notification."
msgstr ""
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+#, fuzzy
+msgid "Notification on."
+msgstr "Không có mã số xác nhận."
+
#. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:757
+#: lib/command.php:756
msgid "Can't turn on notification."
msgstr ""
#. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:770
msgid "Login command is disabled."
msgstr ""
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:783
#, php-format
msgid "This link is useable only once and is valid for only 2 minutes: %s."
msgstr ""
#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:812
#, php-format
msgid "Unsubscribed %s."
msgstr ""
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:831
+#: lib/command.php:830
msgid "You are not subscribed to anyone."
msgstr "Bạn đã theo những người này:"
#. TRANS: Text shown after requesting other users a user is subscribed to.
#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:836
+#: lib/command.php:835
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:857
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Không thể tạo favorite."
+
#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:863
+#: lib/command.php:862
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:884
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
#. TRANS: Text shown after requesting groups a user is subscribed to.
#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:890
+#: lib/command.php:889
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:905
+#: lib/command.php:904
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -3875,72 +7314,130 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:147
+msgid "No configuration file found."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:150
+msgid "I looked for configuration files in the following places:"
msgstr ""
-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:157
msgid "Go to the installer."
msgstr ""
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"
msgid "IM"
-msgstr "IM"
+msgstr ""
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
msgid "Updates by instant messenger (IM)"
msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115
msgid "Updates by SMS"
msgstr "Thay đổi bởi SMS"
-#: lib/connectsettingsaction.php:121
+#. TRANS: Menu item for OuAth connection settings.
+#: lib/connectsettingsaction.php:120
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
+#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
-#: lib/dberroraction.php:60
+#: lib/dberroraction.php:59
msgid "Database error"
msgstr ""
-#: lib/designsettings.php:105
+#. TRANS: Label in form on profile design page.
+#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
+#: lib/designsettings.php:104
msgid "Upload file"
msgstr "Tải tập tin lên"
-#: lib/designsettings.php:418
+#. TRANS: Instructions for form on profile design page.
+#: lib/designsettings.php:109
+#, fuzzy
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
+#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+#: lib/designsettings.php:139
+msgctxt "RADIO"
+msgid "On"
+msgstr ""
+
+#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+#: lib/designsettings.php:156
+msgctxt "RADIO"
+msgid "Off"
+msgstr ""
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
msgid "Design defaults restored."
msgstr ""
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
msgid "Disfavor this notice"
msgstr "Những tin nhắn ưa thích của %s"
-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143
msgid "Favor this notice"
msgstr "Những tin nhắn ưa thích của %s"
-#: lib/feed.php:85
+#: lib/feed.php:84
msgid "RSS 1.0"
msgstr ""
-#: lib/feed.php:87
+#: lib/feed.php:86
msgid "RSS 2.0"
msgstr ""
-#: lib/feed.php:89
+#: lib/feed.php:88
msgid "Atom"
msgstr ""
-#: lib/feed.php:91
+#: lib/feed.php:90
msgid "FOAF"
msgstr ""
-#: lib/feedlist.php:64
-msgid "Export data"
+#. TRANS: Header for feed links (h2).
+#: lib/feedlist.php:66
+msgid "Feeds"
msgstr ""
#: lib/galleryaction.php:121
@@ -3951,6 +7448,16 @@ msgstr ""
msgid "All"
msgstr ""
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "Chọn nhà cung cấp Mobile"
+
+#: lib/galleryaction.php:140
+#, fuzzy
+msgid "Tag"
+msgstr "Từ khóa"
+
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
msgstr ""
@@ -3964,11 +7471,40 @@ msgstr ""
msgid "Grant this user the \"%s\" role"
msgstr ""
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:154
+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 "
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic."
+msgstr ""
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
+
+#: lib/groupeditform.php:170
#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] ""
+
+#: lib/groupeditform.php:182
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
+#: lib/groupeditform.php:190
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:86
msgctxt "MENU"
@@ -4041,11 +7577,20 @@ msgctxt "TOOLTIP"
msgid "Add or edit %s design"
msgstr ""
+#. TRANS: Title for groups with the most members section.
+#: lib/groupsbymemberssection.php:71
+#, fuzzy
+msgid "Groups with most members"
+msgstr "Thành viên"
+
+#. TRANS: Title for groups with the most posts section.
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
msgstr ""
-#: lib/grouptagcloudsection.php:56
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+#: lib/grouptagcloudsection.php:57
#, php-format
msgid "Tags in %s group's notices"
msgstr ""
@@ -4059,26 +7604,58 @@ msgstr "Trang này không phải là phương tiện truyền thông mà bạn c
msgid "Unsupported image file format."
msgstr "Không hỗ trợ kiểu file ảnh này."
-#: lib/imagefile.php:93
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#: lib/imagefile.php:90
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin "
+"về bạn."
+
+#: lib/imagefile.php:95
msgid "Partial upload."
msgstr "Upload từng phần."
#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:101 lib/mediafile.php:179
+#: lib/imagefile.php:103 lib/mediafile.php:228
msgid "System error uploading file."
msgstr "Hệ thống xảy ra lỗi trong khi tải file."
-#: lib/imagefile.php:109
+#: lib/imagefile.php:111
msgid "Not an image or corrupt file."
msgstr "File hỏng hoặc không phải là file ảnh."
-#: lib/imagefile.php:244
-msgid "MB"
-msgstr ""
+#: lib/imagefile.php:160
+#, fuzzy
+msgid "Lost our file."
+msgstr "Không có tin nhắn nào."
-#: lib/imagefile.php:246
-msgid "kB"
-msgstr ""
+#: lib/imagefile.php:197 lib/imagefile.php:237
+#, fuzzy
+msgid "Unknown file type"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
#: lib/jabber.php:387
#, php-format
@@ -4090,42 +7667,99 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "Lưu"
+
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-#. TRANS: Subject for address confirmation email
+#: lib/logingroupnav.php:86
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "Tạo tài khoản mới"
+
+#. TRANS: Subject for address confirmation email.
#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "Xac nhan dia chi email"
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. TRANS: Body for address confirmation email.
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#: lib/mail.php:179
+#, php-format
+msgid ""
+"Hey, %1$s.\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%2$s\n"
+msgstr ""
+
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:246
#, php-format
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
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:253
#, 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: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
+#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
+#. TRANS: %7$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:263
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%2$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %7$s\n"
+msgstr ""
+
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286
#, php-format
msgid "Bio: %s"
msgstr "Lý lịch"
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315
#, 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:308
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#: lib/mail.php:321
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -4135,30 +7769,39 @@ msgid ""
"More email instructions at %3$s.\n"
"\n"
"Faithfully yours,\n"
-"%4$s"
+"%1$s"
msgstr ""
-"Bạn có địa chỉ mới để gửi tin nhắn trên %1$s.\n"
-"\n"
-"Hãy gửi email đến %2$s để có thể nhắn tin.\n"
-"\n"
-"Bạn có thể đọc hướng dẫn tại %3$s.\n"
-"\n"
-"Chúc sức khỏe,\n"
-"%4$s"
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442
+#, 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:468
msgid "SMS confirmation"
msgstr "Xác nhận SMS"
-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472
+#, 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.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493
#, php-format
msgid "You've been nudged by %s"
msgstr ""
-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
+#: lib/mail.php:500
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4174,14 +7817,18 @@ msgid ""
"%4$s\n"
msgstr ""
-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547
#, 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:541
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#: lib/mail.php:555
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -4214,16 +7861,54 @@ msgstr ""
"Chúc sức khỏe,\n"
"%5$s\n"
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:607
#, php-format
-msgid "%s (@%s) added your notice as a favorite"
+msgid "%1$s (@%2$s) added your notice as a favorite"
msgstr ""
-"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
-"thích của họ."
+
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#: lib/mail.php:614
+#, fuzzy, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích của "
+"mình.\n"
+"\n"
+"Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
+"\n"
+"%4$s\n"
+"\n"
+"Chúc sức khỏe,\n"
+"%5$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:651
+#: lib/mail.php:672
#, php-format
msgid ""
"The full conversation can be read here:\n"
@@ -4231,13 +7916,20 @@ msgid ""
"\t%s"
msgstr ""
-#: lib/mail.php:657
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:680
#, php-format
-msgid "%s (@%s) sent a notice to your attention"
+msgid "%1$s (@%2$s) sent a notice to your attention"
msgstr ""
#. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
+#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
+#: lib/mail.php:688
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4274,6 +7966,16 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+#: lib/mailbox.php:228 lib/noticelist.php:521
+#, fuzzy
+msgid "from"
+msgstr " từ "
+
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Không thể cập nhật thành viên."
+
#: lib/mailhandler.php:42
msgid "Not a registered user."
msgstr "Không có người dùng nào đăng ký"
@@ -4286,58 +7988,70 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v
msgid "Sorry, no incoming email allowed."
msgstr "Xin lỗi, không có địa chỉ email cho phép."
+#: lib/mailhandler.php:229
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:99 lib/mediafile.php:125
+#: lib/mediafile.php:102 lib/mediafile.php:174
msgid "There was a database error while saving your file. Please try again."
msgstr ""
#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:145
+#: lib/mediafile.php:194
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
#. TRANS: Client exception.
-#: lib/mediafile.php:151
+#: lib/mediafile.php:200
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
#. TRANS: Client exception.
-#: lib/mediafile.php:157
+#: lib/mediafile.php:206
msgid "The uploaded file was only partially uploaded."
msgstr ""
#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: lib/mediafile.php:165
+#: lib/mediafile.php:214
msgid "Missing a temporary folder."
msgstr ""
#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: lib/mediafile.php:169
+#: lib/mediafile.php:218
msgid "Failed to write file to disk."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: lib/mediafile.php:173
+#: lib/mediafile.php:222
msgid "File upload stopped by extension."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:189 lib/mediafile.php:232
+#: lib/mediafile.php:238 lib/mediafile.php:281
msgid "File exceeds user's quota."
msgstr ""
#. TRANS: Client exception thrown when a file upload operation fails because the file could
#. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:209 lib/mediafile.php:251
+#: lib/mediafile.php:258 lib/mediafile.php:300
msgid "File could not be moved to destination directory."
msgstr ""
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:265 lib/mediafile.php:306
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
+
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
#. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:340
+#: lib/mediafile.php:394
#, php-format
msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -4346,15 +8060,63 @@ msgstr ""
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:345
+#: lib/mediafile.php:399
#, php-format
msgid "\"%s\" is not a supported file type on this server."
msgstr ""
-#: lib/messageform.php:146
+#: lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Xóa tin nhắn"
+
+#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
+#: lib/messageform.php:137
+msgid "Select recipient:"
+msgstr ""
+
+#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#: lib/messageform.php:150
+msgid "No mutual subscribers."
+msgstr ""
+
+#: lib/messageform.php:153
msgid "To"
msgstr ""
+#: lib/messageform.php:166 lib/noticeform.php:186
+#, fuzzy
+msgid "Available characters"
+msgstr "Nhiều hơn 6 ký tự"
+
+#: lib/messageform.php:185 lib/noticeform.php:237
+#, fuzzy
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Gửi"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
+#: lib/noticeform.php:160
+#, fuzzy
+msgid "Send a notice"
+msgstr "Thông báo mới"
+
#: lib/noticeform.php:174
#, php-format
msgid "What's up, %s?"
@@ -4368,49 +8130,75 @@ msgstr ""
msgid "Attach a file"
msgstr ""
+#: lib/noticeform.php:213
+#, fuzzy
+msgid "Share my location"
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: lib/noticeform.php:216
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Không thể lưu hồ sơ cá nhân."
+
#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "N"
+msgstr "Không"
+
#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:453
msgid "S"
msgstr ""
#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:455
msgid "E"
msgstr ""
#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:457
msgid "W"
msgstr ""
-#: lib/noticelist.php:444
+#: lib/noticelist.php:459
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:453
+#: lib/noticelist.php:468
msgid "at"
msgstr ""
-#: lib/noticelist.php:502
+#: lib/noticelist.php:517
msgid "web"
msgstr ""
-#: lib/noticelist.php:630
+#: lib/noticelist.php:583
+#, fuzzy
+msgid "in context"
+msgstr "Không có nội dung!"
+
+#: lib/noticelist.php:618
+#, fuzzy
+msgid "Repeated by"
+msgstr "Tạo"
+
+#: lib/noticelist.php:645
msgid "Reply to this notice"
msgstr "Không thể xóa tin nhắn này."
-#: lib/noticelist.php:631
+#: lib/noticelist.php:646
msgid "Reply"
msgstr "Trả lời"
-#: lib/noticelist.php:675
+#: lib/noticelist.php:690
msgid "Notice repeated"
msgstr "Tìm kiếm thông báo"
@@ -4418,55 +8206,76 @@ msgstr "Tìm kiếm thông báo"
msgid "Nudge this user"
msgstr "Bỏ chặn người dùng này"
-#: lib/oauthstore.php:283
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Tin đã gửi"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Bạn đã theo những người này:"
+
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr ""
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr ""
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr ""
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:346
+#: lib/oauthstore.php:362
msgid "Duplicate notice."
msgstr ""
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
-#: lib/personalgroupnav.php:99
+#: lib/personalgroupnav.php:102
msgid "Personal"
msgstr "Cá nhân"
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107
msgid "Replies"
msgstr "Trả lời"
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117
msgid "Favorites"
msgstr "Ưa thích"
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128
msgid "Inbox"
msgstr "Hộp thư đến"
-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129
msgid "Your incoming messages"
msgstr "Thư đến của bạn"
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133
msgid "Outbox"
msgstr "Hộp thư đi"
-#: lib/personalgroupnav.php:131
+#: lib/personalgroupnav.php:134
msgid "Your sent messages"
msgstr "Thư bạn đã gửi"
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "cảnh báo tin nhắn"
+
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121
+#, fuzzy
+msgid "Unknown"
+msgstr "Không tìm thấy action"
+
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tôi theo bạn này"
@@ -4479,6 +8288,11 @@ msgstr "Tất cả đăng nhận"
msgid "Subscribers"
msgstr "Bạn này theo tôi"
+#: lib/profileaction.php:161
+#, fuzzy
+msgid "All subscribers"
+msgstr "Bạn này theo tôi"
+
#: lib/profileaction.php:191
msgid "User ID"
msgstr ""
@@ -4492,6 +8306,11 @@ msgstr "Gia nhập từ"
msgid "Daily average"
msgstr ""
+#: lib/profileaction.php:264
+#, fuzzy
+msgid "All groups"
+msgstr "Nhóm"
+
#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr ""
@@ -4500,10 +8319,30 @@ msgstr ""
msgid "Public"
msgstr "Công cộng"
+#: lib/publicgroupnav.php:82
+#, fuzzy
+msgid "User groups"
+msgstr "Hồ sơ"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#, fuzzy
+msgid "Recent tags"
+msgstr "Các từ khóa hiện tại"
+
#: lib/publicgroupnav.php:88
msgid "Featured"
msgstr ""
+#: lib/publicgroupnav.php:92
+#, fuzzy
+msgid "Popular"
+msgstr "Tên tài khoản"
+
+#: lib/redirectingaction.php:95
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Không có tài liệu nào."
+
#: lib/repeatform.php:107
msgid "Repeat this notice?"
msgstr "Không thể xóa tin nhắn này."
@@ -4516,21 +8355,50 @@ msgstr "Có"
msgid "Repeat this notice"
msgstr "Không thể xóa tin nhắn này."
-#: lib/router.php:709
-msgid "No single user defined for single-user mode."
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "Ban user"
+
+#. TRANS: Client error on action trying to visit a non-existing page.
+#: lib/router.php:938
+msgid "Page not found."
msgstr ""
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "Hộp thư đến"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Bỏ chặn người dùng này"
+
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "Tìm kiếm"
+
#. TRANS: Used as a field label for the field where one or more keywords
#. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
msgid "Keyword(s)"
msgstr ""
+#. TRANS: Button text for searching site.
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
msgstr ""
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
+#, fuzzy
+msgid "Search help"
+msgstr "Tìm kiếm"
+
#: lib/searchgroupnav.php:80
msgid "People"
msgstr "Tên tài khoản"
@@ -4543,6 +8411,11 @@ msgstr "Tìm kiếm mọi người trên trang web này"
msgid "Find content of notices"
msgstr "Tìm theo nội dung của tin nhắn"
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "Tìm kiếm mọi người trên trang web này"
+
#: lib/section.php:89
msgid "Untitled section"
msgstr ""
@@ -4551,10 +8424,20 @@ msgstr ""
msgid "More..."
msgstr ""
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "Thông báo mới"
+
#: lib/silenceform.php:78
msgid "Silence this user"
msgstr "Bỏ chặn người dùng này"
+#: lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Đăng nhận từ xa"
+
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
@@ -4569,6 +8452,13 @@ msgstr ""
msgid "Invite"
msgstr "Thư mời"
+#: lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
+"của bạn tham gia vào dịch vụ này."
+
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -4579,6 +8469,16 @@ msgstr ""
msgid "People Tagcloud as tagged"
msgstr ""
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Không"
+
+#. TRANS: Server exception displayed if a theme name was invalid.
+#: lib/theme.php:74
+msgid "Invalid theme name."
+msgstr ""
+
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
msgstr ""
@@ -4587,42 +8487,77 @@ msgstr ""
msgid "The theme file is missing or the upload failed."
msgstr ""
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Cập nhật hình đại diện không thành công."
+
#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
msgstr ""
#: lib/themeuploader.php:166
#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
msgid "Invalid theme archive: missing file css/display.css"
msgstr ""
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
msgid "Theme contains unsafe file extension names; may be unsafe."
msgstr ""
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
msgstr ""
+#: lib/themeuploader.php:260
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+
+#: lib/topposterssection.php:74
+#, fuzzy
+msgid "Top posters"
+msgstr "Top posters"
+
+#. TRANS: Title for the form to unblock a user.
+#: lib/unblockform.php:67
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr ""
+
#: lib/unsandboxform.php:69
msgid "Unsandbox"
msgstr ""
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Bỏ chặn người dùng này"
+
#: lib/unsilenceform.php:67
msgid "Unsilence"
msgstr ""
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Bỏ chặn người dùng này"
+
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
msgstr "Ngừng đăng ký từ người dùng này"
@@ -4631,91 +8566,172 @@ msgstr "Ngừng đăng ký từ người dùng này"
msgid "Unsubscribe"
msgstr "Hết theo"
-#: lib/userprofile.php:237
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr ""
+
+#: lib/userprofile.php:119
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Hình đại diện"
+
+#: lib/userprofile.php:236 lib/userprofile.php:250
+#, fuzzy
+msgid "User actions"
+msgstr "Không tìm thấy action"
+
+#: lib/userprofile.php:239
msgid "User deletion in progress..."
msgstr ""
-#: lib/userprofile.php:264
+#: lib/userprofile.php:265
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: lib/userprofile.php:266
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:326
+#: lib/userprofile.php:289
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Bạn đã theo những người này:"
+
+#: lib/userprofile.php:290
+#, fuzzy
+msgid "Message"
+msgstr "Tin mới nhất"
+
+#: lib/userprofile.php:331
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:364
+#: lib/userprofile.php:369
msgid "User role"
msgstr "Người dùng không có thông tin."
-#: lib/userprofile.php:366
+#: lib/userprofile.php:371
msgctxt "role"
msgid "Administrator"
msgstr ""
-#: lib/userprofile.php:367
+#: lib/userprofile.php:372
msgctxt "role"
msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1276
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:1106
+#: lib/util.php:1279
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:1110
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1286
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:1117
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1293
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:1124
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1300
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:1131
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "1 năm trước"
-#: lib/webcolor.php:123
+#: lib/webcolor.php:80
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Trang chủ không phải là URL"
+
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."
+msgstr ""
+
+#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
+#: lib/xmppmanager.php:287
#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgid "Unknown user. Go to %s to add your address to your account"
+msgstr ""
+
+#. TRANS: Response to XMPP source when it sent too long a message.
+#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
+#: lib/xmppmanager.php:406
+#, php-format
+msgid "Message too long. Maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+
+#. TRANS: Exception.
+#: lib/xrd.php:64
+msgid "Invalid XML."
msgstr ""
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
+msgid "No user specified; using backup user."
+msgstr ""
+
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 06e27c4ae..69bcc306b 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:56:36+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:25+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-29 19:47:15+0000\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -526,22 +526,13 @@ msgstr "无法确定源用户。"
msgid "Could not find target user."
msgstr "无法找到目标用户。"
-#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:165 actions/editgroup.php:191
-#: actions/newgroup.php:127 actions/profilesettings.php:243
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-
#. TRANS: Client error trying to create a group with a nickname this is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:175 actions/editgroup.php:196
-#: actions/newgroup.php:132 actions/profilesettings.php:277
-#: actions/register.php:215
+#: actions/apigroupcreate.php:156 actions/editgroup.php:189
+#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
@@ -549,9 +540,9 @@ msgstr "昵称已被使用,换一个吧。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:183 actions/editgroup.php:200
-#: actions/newgroup.php:136 actions/profilesettings.php:247
-#: actions/register.php:217
+#: actions/apigroupcreate.php:164 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
@@ -560,10 +551,10 @@ msgstr "不是有效的昵称。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:200 actions/editapplication.php:233
-#: actions/editgroup.php:207 actions/newapplication.php:211
-#: actions/newgroup.php:143 actions/profilesettings.php:252
-#: actions/register.php:224
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
@@ -571,9 +562,9 @@ msgstr "主页的URL不正确。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:210 actions/editgroup.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:256
-#: actions/register.php:227
+#: actions/apigroupcreate.php:191 actions/editgroup.php:204
+#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "全名过长(不能超过 255 个字符)。"
@@ -585,9 +576,9 @@ msgstr "全名过长(不能超过 255 个字符)。"
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:220 actions/editapplication.php:201
-#: actions/editgroup.php:216 actions/newapplication.php:178
-#: actions/newgroup.php:152
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:149
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
@@ -597,9 +588,9 @@ msgstr[0] "D描述过长(不能超过%d 个字符)。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:234 actions/editgroup.php:223
-#: actions/newgroup.php:159 actions/profilesettings.php:269
-#: actions/register.php:236
+#: actions/apigroupcreate.php:215 actions/editgroup.php:216
+#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "位置过长(不能超过255个字符)。"
@@ -609,8 +600,8 @@ msgstr "位置过长(不能超过255个字符)。"
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:255 actions/editgroup.php:236
-#: actions/newgroup.php:172
+#: actions/apigroupcreate.php:236 actions/editgroup.php:229
+#: actions/newgroup.php:169
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
@@ -618,7 +609,7 @@ msgstr[0] "太多别名了!最多允许%d 个。"
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:280
+#: actions/apigroupcreate.php:253
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "无效的别名:“%s”。"
@@ -627,8 +618,8 @@ msgstr "无效的别名:“%s”。"
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:291 actions/editgroup.php:253
-#: actions/newgroup.php:189
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:184
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "%s这个别名已被使用,换一个吧。"
@@ -636,8 +627,8 @@ msgstr "%s这个别名已被使用,换一个吧。"
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:305 actions/editgroup.php:260
-#: actions/newgroup.php:196
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:191
msgid "Alias can't be the same as nickname."
msgstr "别名不能和昵称相同。"
@@ -830,7 +821,7 @@ msgstr "帐号"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:433
+#: actions/profilesettings.php:110 actions/register.php:432
#: actions/showgroup.php:240 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:134
@@ -840,7 +831,7 @@ msgstr "昵称"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:438 lib/accountsettingsaction.php:120
+#: actions/register.php:437 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "密码"
@@ -1893,24 +1884,24 @@ msgstr "通过这个表单来编辑小组"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:248 actions/newgroup.php:184
+#: actions/editgroup.php:239 actions/newgroup.php:179
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "无效的别名:“%s”。"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:281
+#: actions/editgroup.php:272
msgid "Could not update group."
msgstr "无法更新小组"
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:288 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:529
msgid "Could not create aliases."
msgstr "无法创建别名。"
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:305
+#: actions/editgroup.php:296
msgid "Options saved."
msgstr "选项已保存。"
@@ -2056,7 +2047,7 @@ msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:208
+#: actions/emailsettings.php:379 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
@@ -3011,11 +3002,11 @@ msgstr "登录"
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:258 actions/register.php:492
+#: actions/login.php:258 actions/register.php:491
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:259 actions/register.php:494
+#: actions/login.php:259 actions/register.php:493
msgid "Automatically login in the future; not for shared computers!"
msgstr "下次自动登录,请不要在公共电脑上使用此选项!"
@@ -3406,7 +3397,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:442
+#: actions/register.php:441
msgid "Confirm"
msgstr "密码确认"
@@ -3418,11 +3409,11 @@ msgstr "与上面相同的密码"
msgid "Change"
msgstr "修改"
-#: actions/passwordsettings.php:154 actions/register.php:239
+#: actions/passwordsettings.php:154 actions/register.php:238
msgid "Password must be 6 or more characters."
msgstr "密码必须包含 6 个或更多字符。"
-#: actions/passwordsettings.php:157 actions/register.php:242
+#: actions/passwordsettings.php:157 actions/register.php:241
msgid "Passwords don't match."
msgstr "密码不匹配。"
@@ -3767,7 +3758,7 @@ msgstr "1 到 64 个小写字母或数字,不包含标点或空格。"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:457
+#: actions/profilesettings.php:117 actions/register.php:456
#: actions/showgroup.php:252 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:152
msgid "Full name"
@@ -3775,7 +3766,7 @@ msgstr "全名"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:462
+#: actions/profilesettings.php:122 actions/register.php:461
#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
@@ -3788,26 +3779,26 @@ msgstr "你的主页、博客或在其他网站的URL。"
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:473
+#: actions/profilesettings.php:133 actions/register.php:472
#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:478
+#: actions/profilesettings.php:139 actions/register.php:477
msgid "Describe yourself and your interests"
msgstr "描述你自己和你的兴趣"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:480
+#: actions/profilesettings.php:143 actions/register.php:479
msgid "Bio"
msgstr "自述"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:485
+#: actions/profilesettings.php:149 actions/register.php:484
#: actions/showgroup.php:262 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:180
#: lib/userprofile.php:167
@@ -3815,7 +3806,7 @@ msgid "Location"
msgstr "位置"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:487
+#: actions/profilesettings.php:152 actions/register.php:486
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的地理位置,格式类似\"城市,省份,国家\""
@@ -3866,7 +3857,7 @@ msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
#. TRANS: Validation error in form for profile settings.
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:230
+#: actions/profilesettings.php:262 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
@@ -4140,7 +4131,7 @@ msgstr "密码必须是 6 位或更多字符。"
msgid "Password and confirmation do not match."
msgstr "密码和确认密码不匹配。"
-#: actions/recoverpassword.php:388 actions/register.php:257
+#: actions/recoverpassword.php:388 actions/register.php:256
msgid "Error setting user."
msgstr "保存用户设置时出错。"
@@ -4148,7 +4139,7 @@ msgstr "保存用户设置时出错。"
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,你现在已登录。"
-#: actions/register.php:92 actions/register.php:196 actions/register.php:414
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
msgid "Sorry, only invited people can register."
msgstr "对不起,只有被邀请的用户才能注册。"
@@ -4160,7 +4151,7 @@ msgstr "对不起,无效的邀请码。"
msgid "Registration successful"
msgstr "注册成功"
-#: actions/register.php:121 actions/register.php:513 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -4168,19 +4159,19 @@ msgstr "注册"
msgid "Registration not allowed."
msgstr "不允许注册。"
-#: actions/register.php:205
+#: actions/register.php:209
msgid "You can't register if you don't agree to the license."
msgstr "你必须同意许可协议才能注册。"
-#: actions/register.php:219
+#: actions/register.php:218
msgid "Email address already exists."
msgstr "电子邮件地址已存在。"
-#: actions/register.php:252 actions/register.php:274
+#: actions/register.php:251 actions/register.php:273
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
-#: actions/register.php:352
+#: actions/register.php:351
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -4188,59 +4179,59 @@ msgstr ""
"你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"
"系。 "
-#: actions/register.php:434
+#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 到 64 位的小写字母或数字,不能使用标点和空格。此项必填。"
-#: actions/register.php:439
+#: actions/register.php:438
msgid "6 or more characters. Required."
msgstr "至少 6 位字符。此项必填。"
-#: actions/register.php:443
+#: actions/register.php:442
msgid "Same as password above. Required."
msgstr "与上面输入相同的密码。此项必填。"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "电子邮件"
-#: actions/register.php:448 actions/register.php:452
+#: actions/register.php:447 actions/register.php:451
msgid "Used only for updates, announcements, and password recovery"
msgstr "只用于更新、通知及密码恢复"
-#: actions/register.php:459
+#: actions/register.php:458
msgid "Longer name, preferably your \"real\" name"
msgstr "更长的名字,最好是“真实姓名”"
-#: actions/register.php:464
+#: actions/register.php:463
msgid "URL of your homepage, blog, or profile on another site"
msgstr "你的主页、博客或在其他网站的URL"
-#: actions/register.php:525
+#: actions/register.php:524
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "我明白%1$s的信息是私人且保密的。"
-#: actions/register.php:535
+#: actions/register.php:534
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "我的文字和文件的版权归%1$s所有。"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:539
+#: actions/register.php:538
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:542
+#: actions/register.php:541
msgid "All rights reserved."
msgstr "保留所有权利。"
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:547
+#: actions/register.php:546
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
@@ -4249,7 +4240,7 @@ msgstr ""
"我的文字和文件在%s下提供,除了如下隐私内容:密码、电子邮件地址、IM 地址和电话"
"号码。"
-#: actions/register.php:590
+#: actions/register.php:589
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4279,7 +4270,7 @@ msgstr ""
"\n"
"感谢你的注册,希望你喜欢这个服务。"
-#: actions/register.php:614
+#: actions/register.php:613
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -6042,18 +6033,18 @@ msgstr "%1$s 现在开始关注了 %2$s。"
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:385
+#: classes/User.php:395
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "欢迎来到 %1$s,@%2$s!"
#. TRANS: Server exception.
-#: classes/User.php:913
+#: classes/User.php:923
msgid "No single user defined for single-user mode."
msgstr "没有单独的用户被定义为单用户模式。"
#. TRANS: Server exception.
-#: classes/User.php:917
+#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
msgstr "没启用单用户模式的代码。"
@@ -6653,7 +6644,7 @@ msgstr "取消"
#: lib/applicationlist.php:247
msgid " by "
-msgstr "by "
+msgstr " by "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -7107,24 +7098,24 @@ msgstr ""
"tracking - 尚未实现。\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:136
+#: lib/common.php:147
msgid "No configuration file found."
msgstr "没有找到配置文件。"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:139
+#: lib/common.php:150
msgid "I looked for configuration files in the following places:"
msgstr "我在以下位置查找了配置文件:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:142
+#: lib/common.php:153
msgid "You may wish to run the installer to fix this."
msgstr "或许你想运行安装程序来解决这个问题。"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:146
+#: lib/common.php:157
msgid "Go to the installer."
msgstr "去安装程序。"
@@ -7943,6 +7934,23 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "发布"
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:145
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "昵称只能使用小写字母和数字且不能使用空格。"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:158
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#: lib/nickname.php:171
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+
#: lib/noticeform.php:160
msgid "Send a notice"
msgstr "发送一个通知"
@@ -8177,7 +8185,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "取消这个用户的\"%s\"权限"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:858
+#: lib/router.php:938
msgid "Page not found."
msgstr "没有找到页面。"
@@ -8423,60 +8431,60 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1276
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1180
+#: lib/util.php:1279
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1283
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] "约%d分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1187
+#: lib/util.php:1286
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1191
+#: lib/util.php:1290
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] "约%d小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1194
+#: lib/util.php:1293
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1198
+#: lib/util.php:1297
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] "约%d天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1201
+#: lib/util.php:1300
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1205
+#: lib/util.php:1304
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] "约%d个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1208
+#: lib/util.php:1307
msgid "about a year ago"
msgstr "约1年前"
diff --git a/plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po
new file mode 100644
index 000000000..23b2c1c8b
--- /dev/null
+++ b/plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - Adsense to Turkish (Türkçe)
+# Expored from translatewiki.net
+#
+# Author: Maidis
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:28+0000\n"
+"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:38:20+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: #out-statusnet-plugin-adsense\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Menu item title/tooltip
+#: AdsensePlugin.php:194
+msgid "AdSense configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+#: AdsensePlugin.php:196
+msgid "AdSense"
+msgstr "AdSense"
+
+#: AdsensePlugin.php:209
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr ""
+
+#: adsenseadminpanel.php:52
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr "AdSense"
+
+#: adsenseadminpanel.php:62
+msgid "AdSense settings for this StatusNet site"
+msgstr ""
+
+#: adsenseadminpanel.php:164
+msgid "Client ID"
+msgstr ""
+
+#: adsenseadminpanel.php:165
+msgid "Google client ID"
+msgstr ""
+
+#: adsenseadminpanel.php:170
+msgid "Ad script URL"
+msgstr ""
+
+#: adsenseadminpanel.php:171
+msgid "Script URL (advanced)"
+msgstr ""
+
+#: adsenseadminpanel.php:176
+msgid "Medium rectangle"
+msgstr ""
+
+#: adsenseadminpanel.php:177
+msgid "Medium rectangle slot code"
+msgstr ""
+
+#: adsenseadminpanel.php:182
+msgid "Rectangle"
+msgstr ""
+
+#: adsenseadminpanel.php:183
+msgid "Rectangle slot code"
+msgstr ""
+
+#: adsenseadminpanel.php:188
+msgid "Leaderboard"
+msgstr ""
+
+#: adsenseadminpanel.php:189
+msgid "Leaderboard slot code"
+msgstr ""
+
+#: adsenseadminpanel.php:194
+msgid "Skyscraper"
+msgstr ""
+
+#: adsenseadminpanel.php:195
+msgid "Wide skyscraper slot code"
+msgstr ""
+
+#: adsenseadminpanel.php:208
+msgid "Save"
+msgstr "Kaydet"
+
+#: adsenseadminpanel.php:208
+msgid "Save AdSense settings"
+msgstr "AdSense ayarlarını kaydet"
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index 93a35b3f3..b4f80a50a 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -118,7 +118,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
$params = http_build_query(array(
'login' => $this->getLogin(),
'apiKey' => $this->getApiKey()), '', '&');
- $serviceUrl = sprintf($this->serviceUrl, $url) . '&' . $params;
+ $serviceUrl = sprintf($this->serviceUrl, urlencode($url)) . '&' . $params;
$request = HTTPClient::start();
return $request->get($serviceUrl);
@@ -145,6 +145,10 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
common_log(LOG_INFO, $body);
$json = json_decode($body, true);
if ($json['statusCode'] == 'OK') {
+ if (!isset($json['results'][$url])) {
+ common_log(LOG_ERR, "bit.ly returned OK response, but didn't find expected URL $url in $body");
+ return false;
+ }
$data = $json['results'][$url];
if (isset($data['shortUrl'])) {
return true;
diff --git a/plugins/BitlyUrl/locale/br/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/br/LC_MESSAGES/BitlyUrl.po
new file mode 100644
index 000000000..8e1c92f8c
--- /dev/null
+++ b/plugins/BitlyUrl/locale/br/LC_MESSAGES/BitlyUrl.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - BitlyUrl to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BitlyUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:33+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:41:49+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: BitlyUrlPlugin.php:48
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr ""
+
+#: BitlyUrlPlugin.php:171
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+
+#: BitlyUrlPlugin.php:212
+msgid "bit.ly"
+msgstr "bit.ly"
+
+#: BitlyUrlPlugin.php:213 bitlyadminpanelaction.php:54
+msgid "bit.ly URL shortening"
+msgstr ""
+
+#: bitlyadminpanelaction.php:65
+msgid ""
+"URL shortening with bit.ly requires [a bit.ly account and API key](http://"
+"bit.ly/a/your_api_key). This verifies that this is an authorized account, "
+"and allow you to use bit.ly's tracking features and custom domains."
+msgstr ""
+
+#: bitlyadminpanelaction.php:132
+msgid "Invalid login. Max length is 255 characters."
+msgstr ""
+
+#: bitlyadminpanelaction.php:138
+msgid "Invalid API key. Max length is 255 characters."
+msgstr ""
+
+#: bitlyadminpanelaction.php:191
+msgid "Credentials"
+msgstr ""
+
+#: bitlyadminpanelaction.php:199
+msgid "Leave these empty to use global default credentials."
+msgstr ""
+
+#: bitlyadminpanelaction.php:202
+msgid "If you leave these empty, bit.ly will be unavailable to users."
+msgstr ""
+
+#: bitlyadminpanelaction.php:209
+msgid "Login name"
+msgstr "Anv implijer"
+
+#: bitlyadminpanelaction.php:218
+msgid "API key"
+msgstr ""
+
+#: bitlyadminpanelaction.php:236
+msgid "Save bit.ly settings"
+msgstr "Enrollañ arventennoù bit.ly"
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
new file mode 100644
index 000000000..2443894e3
--- /dev/null
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - BitlyUrl to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BitlyUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:33+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:41:49+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: BitlyUrlPlugin.php:48
+msgid "You must specify a serviceUrl for bit.ly shortening."
+msgstr ""
+
+#: BitlyUrlPlugin.php:171
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+
+#: BitlyUrlPlugin.php:212
+msgid "bit.ly"
+msgstr ""
+
+#: BitlyUrlPlugin.php:213 bitlyadminpanelaction.php:54
+msgid "bit.ly URL shortening"
+msgstr ""
+
+#: bitlyadminpanelaction.php:65
+msgid ""
+"URL shortening with bit.ly requires [a bit.ly account and API key](http://"
+"bit.ly/a/your_api_key). This verifies that this is an authorized account, "
+"and allow you to use bit.ly's tracking features and custom domains."
+msgstr ""
+
+#: bitlyadminpanelaction.php:132
+msgid "Invalid login. Max length is 255 characters."
+msgstr "Rexistro incorrecto. A extensión máxima é de 255 caracteres."
+
+#: bitlyadminpanelaction.php:138
+msgid "Invalid API key. Max length is 255 characters."
+msgstr "Clave API incorrecta. A extensión máxima é de 255 caracteres."
+
+#: bitlyadminpanelaction.php:191
+msgid "Credentials"
+msgstr ""
+
+#: bitlyadminpanelaction.php:199
+msgid "Leave these empty to use global default credentials."
+msgstr ""
+
+#: bitlyadminpanelaction.php:202
+msgid "If you leave these empty, bit.ly will be unavailable to users."
+msgstr ""
+
+#: bitlyadminpanelaction.php:209
+msgid "Login name"
+msgstr "Nome de usuario"
+
+#: bitlyadminpanelaction.php:218
+msgid "API key"
+msgstr ""
+
+#: bitlyadminpanelaction.php:236
+msgid "Save bit.ly settings"
+msgstr "Gardar a configuración bit.ly"
diff --git a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 000000000..e7aaddc33
--- /dev/null
+++ b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,71 @@
+# Translation of StatusNet - CasAuthentication to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: Michael
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:39+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:11:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-casauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:83
+msgid "CAS"
+msgstr "CAS"
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:85
+msgid "Login or register with CAS."
+msgstr ""
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#: CasAuthenticationPlugin.php:101
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+
+#: CasAuthenticationPlugin.php:128
+msgid "Specifying a server is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:131
+msgid "Specifying a port is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:134
+msgid "Specifying a path is required."
+msgstr ""
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:154
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+
+#: caslogin.php:28
+msgid "Already logged in."
+msgstr "Bereits angemeldet."
+
+#: caslogin.php:39
+msgid "Incorrect username or password."
+msgstr ""
+
+#: caslogin.php:45
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
diff --git a/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 000000000..180e2df94
--- /dev/null
+++ b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,73 @@
+# Translation of StatusNet - CasAuthentication to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:39+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:11:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-casauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:83
+msgid "CAS"
+msgstr ""
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:85
+msgid "Login or register with CAS."
+msgstr ""
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#: CasAuthenticationPlugin.php:101
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+
+#: CasAuthenticationPlugin.php:128
+msgid "Specifying a server is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:131
+msgid "Specifying a port is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:134
+msgid "Specifying a path is required."
+msgstr ""
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:154
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+
+#: caslogin.php:28
+msgid "Already logged in."
+msgstr "Xa se identificou."
+
+#: caslogin.php:39
+msgid "Incorrect username or password."
+msgstr "Nome de usuario ou contrasinal incorrectos."
+
+#: caslogin.php:45
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+"Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
+"para facelo."
diff --git a/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 000000000..0fc6f8ad1
--- /dev/null
+++ b/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,71 @@
+# Translation of StatusNet - CasAuthentication to Telugu (తెలుగు)
+# Expored from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:40+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:11:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-casauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:83
+msgid "CAS"
+msgstr ""
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:85
+msgid "Login or register with CAS."
+msgstr ""
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#: CasAuthenticationPlugin.php:101
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+
+#: CasAuthenticationPlugin.php:128
+msgid "Specifying a server is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:131
+msgid "Specifying a port is required."
+msgstr ""
+
+#: CasAuthenticationPlugin.php:134
+msgid "Specifying a path is required."
+msgstr ""
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+#: CasAuthenticationPlugin.php:154
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+
+#: caslogin.php:28
+msgid "Already logged in."
+msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
+
+#: caslogin.php:39
+msgid "Incorrect username or password."
+msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
+
+#: caslogin.php:45
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
diff --git a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
new file mode 100644
index 000000000..9c61bad73
--- /dev/null
+++ b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - Disqus to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:42+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:41:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: DisqusPlugin.php:142
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#: DisqusPlugin.php:149
+msgid "Comments powered by "
+msgstr ""
+
+#: DisqusPlugin.php:201
+msgid "Comments"
+msgstr "Comentarios"
+
+#: DisqusPlugin.php:241
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
diff --git a/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
new file mode 100644
index 000000000..ccd23e668
--- /dev/null
+++ b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - Disqus to Telugu (తెలుగు)
+# Expored from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:43+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:41:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: DisqusPlugin.php:142
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#: DisqusPlugin.php:149
+msgid "Comments powered by "
+msgstr ""
+
+#: DisqusPlugin.php:201
+msgid "Comments"
+msgstr "వ్యాఖ్యలు"
+
+#: DisqusPlugin.php:241
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index b93939299..6c4466621 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -138,23 +138,19 @@ msgstr ""
msgid "Not a valid invitation code."
msgstr ""
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr ""
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index f614507b0..453445d85 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:40:48+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:52+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-30 23:43:40+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -147,23 +147,19 @@ msgstr "N'eo ket aotreet krouiñ kontoù."
msgid "Not a valid invitation code."
msgstr "N'eo ket reizh ar c'hod pedadenn."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Lesanv nann-aotreet."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index 6293a7af8..d9cec5fdc 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:52+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -167,25 +167,19 @@ msgstr "Registrierung nicht erlaubt."
msgid "Not a valid invitation code."
msgstr "Kein gültiger Einladungscode."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
-"Leerzeichen sind nicht erlaubt."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Benutzername nicht erlaubt."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
@@ -582,3 +576,8 @@ msgstr "%s erlauben, meinen Facebook-Status zu aktualisieren"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Synchronisierungs-Einstellungen"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+#~ "Leerzeichen sind nicht erlaubt."
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index 8bb4e4fbc..0f4599c7f 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -11,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:52+0000\n"
"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -162,25 +162,19 @@ msgstr "Registro de usuario no permitido."
msgid "Not a valid invitation code."
msgstr "No es un código de invitación válido."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"El nombre de usuario debe tener sólo letras minúsculas y números, sin "
-"espacios."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Nombre de usuario no autorizado."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "El nombre de usuario ya existe. Prueba con otro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Error de conexión del usuario a Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nombre de usuario o contraseña inválidos."
@@ -567,3 +561,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "El nombre de usuario debe tener sólo letras minúsculas y números, sin "
+#~ "espacios."
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index d62550a39..0288bb000 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -166,25 +166,19 @@ msgstr "Inscription non autorisée."
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
-"chiffres, sans espaces."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Erreur de connexion de l’utilisateur à Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
@@ -585,3 +579,8 @@ msgstr "Autoriser %s à mettre à jour mon statut Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Préférences de synchronisation"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
+#~ "chiffres, sans espaces."
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index 13478bc0f..7ac523490 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+0000\n"
"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -148,25 +148,19 @@ msgstr "Non se permite o rexistro."
msgid "Not a valid invitation code."
msgstr "O código da invitación é incorrecto."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
-"en branco."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
@@ -549,3 +543,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "O alcume debe ter só letras en minúscula e números, e non pode ter "
+#~ "espazos en branco."
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 00153ab2f..eb276166c 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -161,23 +161,19 @@ msgstr "Creation de conto non permittite."
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Error durante le connexion del usator a Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
@@ -574,3 +570,7 @@ msgstr "Permitter a %s de actualisar mi stato de Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Preferentias de synchronisation"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index b663b17c5..e670a7459 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -161,24 +161,19 @@ msgstr "Регистрацијата не е дозволена."
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Прекарот мора да се состои само од мали букви и бројки, без празни места."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Грешка при поврзувањето на корисникот со Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
@@ -571,3 +566,7 @@ msgstr "Дозволи %s да го менува мојот статус на Fa
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Услогласи нагодувања"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Прекарот мора да се состои само од мали букви и бројки, без празни места."
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index d35302232..1d7873e97 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -143,23 +143,19 @@ msgstr "Registrering ikke tillatt."
msgid "Not a valid invitation code."
msgstr "Ikke en gyldig invitasjonskode."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Kallenavn er ikke tillatt."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord."
@@ -542,3 +538,6 @@ msgstr "Tillat %s å oppdatere min Facebook-status"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 47ae29268..6812d8671 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:57:15+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:54+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -166,26 +166,20 @@ msgstr "Registratie is niet toegestaan."
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
-"zijn niet toegestaan."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
@@ -582,3 +576,8 @@ msgstr "%s toestaan mijn Facebookstatus bij te werken"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Synchronisatievooreuren"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+#~ "zijn niet toegestaan."
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index 88b3ea2d1..70fbdf3e5 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
"br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -145,25 +145,19 @@ msgstr "Não é permitido o registro."
msgid "Not a valid invitation code."
msgstr "O código de convite é inválido."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O apelido deve conter apenas letras minúsculas e números e não pode ter "
-"espaços."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Apelido não permitido."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Este apelido já está em uso. Tente outro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Erro ao conectar o usuário ao Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr ""
@@ -548,3 +542,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "O apelido deve conter apenas letras minúsculas e números e não pode ter "
+#~ "espaços."
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index c8fbf25fe..5833cdb95 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -167,25 +167,19 @@ msgstr "Hindi pinapahintulutan ang pagpapatala."
msgid "Not a valid invitation code."
msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ang palayaw ay dapat na may mga maliliit na mga titik lamang at mga bilang "
-"at walang mga patlang."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Hindi pinapahintulutan ang palayaw."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Ginagamit na ang palayaw. Subukan ang iba."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
@@ -587,3 +581,8 @@ msgstr "Pahintulutan si %s na isapanahon ang aking katayuan ng Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Mga nais sa pagsabay"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ang palayaw ay dapat na may mga maliliit na mga titik lamang at mga "
+#~ "bilang at walang mga patlang."
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index 058733a1f..a8bc05155 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -163,25 +163,19 @@ msgstr "Реєстрацію не дозволено."
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Помилка при підключенні до Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Невірне ім’я або пароль."
@@ -577,3 +571,8 @@ msgstr "Дозволити додатку %s оновлювати мій ста
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Параметри синхронізації"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, "
+#~ "ніяких інтервалів."
diff --git a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
new file mode 100644
index 000000000..31b660d19
--- /dev/null
+++ b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
@@ -0,0 +1,540 @@
+# Translation of StatusNet - Facebook to Vietnamese (Tiếng Việt)
+# Expored from translatewiki.net
+#
+# Author: Minh Nguyen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Facebook\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
+"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: vi\n"
+"X-Message-Group: #out-statusnet-plugin-facebook\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: facebookutil.php:429
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %2$s, and have disabled the Facebook application for "
+"your account. This may be because you have removed the Facebook "
+"application's authorization, or have deleted your Facebook account. You can "
+"re-enable the Facebook application and automatic status updating by re-"
+"installing the %2$s Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%2$s"
+msgstr ""
+
+#: FBConnectAuth.php:55
+msgid "You must be logged into Facebook to use Facebook Connect."
+msgstr ""
+
+#: FBConnectAuth.php:79
+msgid "There is already a local user linked with this Facebook account."
+msgstr ""
+
+#: FBConnectAuth.php:91 FBConnectSettings.php:166
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: FBConnectAuth.php:96
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: FBConnectAuth.php:106
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: %s is the site name.
+#: FBConnectAuth.php:121
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectAuth.php:128
+msgid "Facebook Account Setup"
+msgstr "Thiết lập Tài khoản Facebook"
+
+#. TRANS: Legend.
+#: FBConnectAuth.php:162
+msgid "Connection options"
+msgstr ""
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: FBConnectAuth.php:172
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#. TRANS: Legend.
+#: FBConnectAuth.php:189
+msgid "Create new account"
+msgstr ""
+
+#: FBConnectAuth.php:191
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:195
+msgid "New nickname"
+msgstr ""
+
+#: FBConnectAuth.php:197
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:201
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Tạo"
+
+#: FBConnectAuth.php:207
+msgid "Connect existing account"
+msgstr ""
+
+#: FBConnectAuth.php:209
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:213
+msgid "Existing nickname"
+msgstr ""
+
+#: FBConnectAuth.php:216 facebookaction.php:277
+msgid "Password"
+msgstr "Mật khẩu"
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:220
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Kết nối"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: FBConnectAuth.php:237 FBConnectAuth.php:247
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: FBConnectAuth.php:255
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: FBConnectAuth.php:267
+msgid "Nickname not allowed."
+msgstr ""
+
+#: FBConnectAuth.php:272
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+msgid "Error connecting user to Facebook."
+msgstr ""
+
+#: FBConnectAuth.php:310
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: Page title.
+#: facebooklogin.php:90 facebookaction.php:255
+msgid "Login"
+msgstr "Đăng nhập"
+
+#. TRANS: Legend.
+#: facebooknoticeform.php:144
+msgid "Send a notice"
+msgstr ""
+
+#. TRANS: Field label.
+#: facebooknoticeform.php:157
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: facebooknoticeform.php:169
+msgid "Available characters"
+msgstr ""
+
+#. TRANS: Button text.
+#: facebooknoticeform.php:196
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Gửi"
+
+#: facebookhome.php:103
+msgid "Server error: Couldn't get user!"
+msgstr ""
+
+#: facebookhome.php:122
+msgid "Incorrect username or password."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$s is a page number.
+#: facebookhome.php:153
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname
+#: facebookhome.php:157
+#, php-format
+msgid "%s and friends"
+msgstr "%s và bạn bè"
+
+#. TRANS: Instructions. %s is the application name.
+#: facebookhome.php:185
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: facebookhome.php:210
+msgid "Okay, do it!"
+msgstr ""
+
+#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
+#: facebookhome.php:217
+msgctxt "BUTTON"
+msgid "Skip"
+msgstr "Bỏ qua"
+
+#: facebookhome.php:244 facebookaction.php:336
+msgid "Pagination"
+msgstr ""
+
+#. TRANS: Pagination link.
+#: facebookhome.php:254 facebookaction.php:345
+msgid "After"
+msgstr "Sau"
+
+#. TRANS: Pagination link.
+#: facebookhome.php:263 facebookaction.php:353
+msgid "Before"
+msgstr "Trước"
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:69
+#, php-format
+msgid "Thanks for inviting your friends to use %s."
+msgstr ""
+
+#. TRANS: Followed by an unordered list with invited friends.
+#: facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: facebookinvite.php:91
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:101
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:124
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#. TRANS: Page title.
+#: facebookinvite.php:143
+msgid "Send invitations"
+msgstr ""
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:190
+msgid "Facebook integration configuration"
+msgstr ""
+
+#: FacebookPlugin.php:431
+msgid "Facebook Connect User"
+msgstr "Người dùng Kết nối Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:463
+msgid "Login or register using Facebook"
+msgstr ""
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title.
+#: FacebookPlugin.php:487 FBConnectSettings.php:55
+msgid "Facebook Connect Settings"
+msgstr "Thiết lập Kết nối Facebook"
+
+#: FacebookPlugin.php:591
+msgid ""
+"The Facebook plugin allows integrating StatusNet instances with <a href="
+"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
+msgstr ""
+
+#: FBConnectLogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Instructions.
+#: FBConnectLogin.php:42
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectLogin.php:57
+msgid "Facebook Login"
+msgstr "Đăng nhập vào Facebook"
+
+#: facebookremove.php:53
+msgid "Couldn't remove Facebook user: already deleted."
+msgstr ""
+
+#: facebookremove.php:63
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#. TRANS: Link description for 'Home' link that leads to a start page.
+#: facebookaction.php:169
+msgctxt "MENU"
+msgid "Home"
+msgstr "Trang chủ"
+
+#. TRANS: Tooltip for 'Home' link that leads to a start page.
+#: facebookaction.php:171
+msgid "Home"
+msgstr "Trang chủ"
+
+#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:180
+msgctxt "MENU"
+msgid "Invite"
+msgstr ""
+
+#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:182
+msgid "Invite"
+msgstr ""
+
+#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:192
+msgctxt "MENU"
+msgid "Settings"
+msgstr "Thiết lập"
+
+#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:194
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: facebookaction.php:233
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet?"
+msgstr ""
+
+#: facebookaction.php:235
+msgid " a new account."
+msgstr ""
+
+#: facebookaction.php:242
+msgid "Register"
+msgstr "Đăng ký"
+
+#: facebookaction.php:274
+msgid "Nickname"
+msgstr ""
+
+#. TRANS: Login button.
+#: facebookaction.php:282
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: facebookaction.php:288
+msgid "Lost or forgotten password?"
+msgstr ""
+
+#: facebookaction.php:370
+msgid "No notice content!"
+msgstr ""
+
+#: facebookaction.php:377
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: facebookaction.php:431
+msgid "Notices"
+msgstr ""
+
+#: facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr ""
+
+#: facebookadminpanel.php:123
+msgid "Invalid Facebook API key. Max length is 255 characters."
+msgstr ""
+
+#: facebookadminpanel.php:129
+msgid "Invalid Facebook API secret. Max length is 255 characters."
+msgstr ""
+
+#: facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Thiết lập ứng dụng Facebook"
+
+#: facebookadminpanel.php:184
+msgid "API key"
+msgstr ""
+
+#: facebookadminpanel.php:185
+msgid "API key provided by Facebook"
+msgstr ""
+
+#: facebookadminpanel.php:193
+msgid "Secret"
+msgstr ""
+
+#: facebookadminpanel.php:194
+msgid "API secret provided by Facebook"
+msgstr ""
+
+#: facebookadminpanel.php:210
+msgid "Save"
+msgstr "Lưu"
+
+#: facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Lưu các thiết lập Facebook"
+
+#. TRANS: Instructions.
+#: FBConnectSettings.php:66
+msgid "Manage how your account connects to Facebook"
+msgstr ""
+
+#: FBConnectSettings.php:90
+msgid "There is no Facebook user connected to this account."
+msgstr ""
+
+#: FBConnectSettings.php:98
+msgid "Connected Facebook user"
+msgstr "Người dùng Facebook kết nối"
+
+#. TRANS: Legend.
+#: FBConnectSettings.php:118
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#. TRANS: Followed by a link containing text "set a password".
+#: FBConnectSettings.php:125
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please "
+msgstr ""
+
+#. TRANS: Preceded by "Please " and followed by " first."
+#: FBConnectSettings.php:130
+msgid "set a password"
+msgstr ""
+
+#. TRANS: Preceded by "Please set a password".
+#: FBConnectSettings.php:132
+msgid " first."
+msgstr ""
+
+#. TRANS: Submit button.
+#: FBConnectSettings.php:145
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Ngắt kết nối"
+
+#: FBConnectSettings.php:180
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:196
+msgid "You have disconnected from Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:199
+msgid "Not sure what you're trying to do."
+msgstr ""
+
+#: facebooksettings.php:61
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: facebooksettings.php:64
+msgid "Sync preferences saved."
+msgstr ""
+
+#: facebooksettings.php:87
+msgid "Automatically update my Facebook status with my notices."
+msgstr ""
+
+#: facebooksettings.php:94
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#. TRANS: Submit button to save synchronisation settings.
+#: facebooksettings.php:102
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Lưu"
+
+#. TRANS: %s is the application name.
+#: facebooksettings.php:111
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: facebooksettings.php:124
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#. TRANS: Page title for synchronisation settings.
+#: facebooksettings.php:134
+msgid "Sync preferences"
+msgstr ""
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index 03f85020c..5a4ad5ca0 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:36+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,23 +157,19 @@ msgstr "不允许注册。"
msgid "Not a valid invitation code."
msgstr "对不起,无效的邀请码。"
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "昵称不被允许。"
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "连接用户至Facebook时发生错误。"
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
@@ -557,3 +553,6 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr "昵称只能使用小写字母和数字且不能使用空格。"
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 7da9a7758..08c0813fc 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -44,11 +44,11 @@ msgstr ""
msgid "A plugin for integrating StatusNet with Facebook."
msgstr ""
-#: lib/facebookclient.php:775
+#: lib/facebookclient.php:776
msgid "Your Facebook connection has been removed"
msgstr ""
-#: lib/facebookclient.php:834
+#: lib/facebookclient.php:835
#, php-format
msgid "Contact the %s administrator to retrieve your account"
msgstr ""
@@ -160,23 +160,19 @@ msgstr ""
msgid "Not a valid invitation code."
msgstr ""
-#: actions/facebookfinishlogin.php:332
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: actions/facebookfinishlogin.php:337
+#: actions/facebookfinishlogin.php:335
msgid "Nickname not allowed."
msgstr ""
-#: actions/facebookfinishlogin.php:342
+#: actions/facebookfinishlogin.php:340
msgid "Nickname already in use. Try another one."
msgstr ""
-#: actions/facebookfinishlogin.php:370 actions/facebookfinishlogin.php:507
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
msgid "Error connecting user to Facebook."
msgstr ""
-#: actions/facebookfinishlogin.php:470
+#: actions/facebookfinishlogin.php:468
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 11b635e32..2d338e877 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - FacebookBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:57:19+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:00+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 20:21:26+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -49,11 +49,11 @@ msgstr "Поставки за Facebook"
msgid "A plugin for integrating StatusNet with Facebook."
msgstr "Приклучок за обединување на StatusNet со Facebook."
-#: lib/facebookclient.php:775
+#: lib/facebookclient.php:776
msgid "Your Facebook connection has been removed"
msgstr "Вашата врска со Facebook е отстранета"
-#: lib/facebookclient.php:834
+#: lib/facebookclient.php:835
#, php-format
msgid "Contact the %s administrator to retrieve your account"
msgstr "Контактирајте го администраторот на %s за да си ја повртатите сметката"
@@ -174,23 +174,19 @@ msgstr "Регистрирањето не е дозволено."
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: actions/facebookfinishlogin.php:332
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
-
-#: actions/facebookfinishlogin.php:337
+#: actions/facebookfinishlogin.php:335
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: actions/facebookfinishlogin.php:342
+#: actions/facebookfinishlogin.php:340
msgid "Nickname already in use. Try another one."
msgstr "Тој прекар е во употреба. Одберете друг."
-#: actions/facebookfinishlogin.php:370 actions/facebookfinishlogin.php:507
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
msgid "Error connecting user to Facebook."
msgstr "Грешка при поврзувањето на корисникот со Facebook."
-#: actions/facebookfinishlogin.php:470
+#: actions/facebookfinishlogin.php:468
msgid "Invalid username or password."
msgstr "Погрешно име или лозинка."
@@ -314,3 +310,7 @@ msgstr "Не можев да ја избришам врската со Facebook.
#: actions/facebooksettings.php:268
msgid "You have disconnected from Facebook."
msgstr "Сега сте исклучени од Facebook."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Прекарот мора да има само мали букви и бројки и да нема празни места."
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 64b282ad4..359425d22 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - FacebookBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:57:19+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:00+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 20:21:26+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:27+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -49,11 +49,11 @@ msgstr "Facebookinstellingen"
msgid "A plugin for integrating StatusNet with Facebook."
msgstr "Een plug-in voor het integreren van StatusNet met Facebook."
-#: lib/facebookclient.php:775
+#: lib/facebookclient.php:776
msgid "Your Facebook connection has been removed"
msgstr "Uw koppeling met Facebook is verwijderd"
-#: lib/facebookclient.php:834
+#: lib/facebookclient.php:835
#, php-format
msgid "Contact the %s administrator to retrieve your account"
msgstr ""
@@ -178,26 +178,20 @@ msgstr "Registratie is niet toegestaan."
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: actions/facebookfinishlogin.php:332
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
-"zijn niet toegestaan."
-
-#: actions/facebookfinishlogin.php:337
+#: actions/facebookfinishlogin.php:335
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: actions/facebookfinishlogin.php:342
+#: actions/facebookfinishlogin.php:340
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: actions/facebookfinishlogin.php:370 actions/facebookfinishlogin.php:507
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
msgid "Error connecting user to Facebook."
msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-#: actions/facebookfinishlogin.php:470
+#: actions/facebookfinishlogin.php:468
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
@@ -323,3 +317,8 @@ msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
#: actions/facebooksettings.php:268
msgid "You have disconnected from Facebook."
msgstr "U bent losgekoppeld van Facebook."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+#~ "zijn niet toegestaan."
diff --git a/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po
new file mode 100644
index 000000000..f1739e3f2
--- /dev/null
+++ b/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - GroupFavorited to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupFavorited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:12+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:41:58+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is a group name.
+#: groupfavoritedaction.php:48
+#, php-format
+msgid "Popular posts in %s group"
+msgstr ""
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#: groupfavoritedaction.php:51
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#: GroupFavoritedPlugin.php:72
+msgctxt "MENU"
+msgid "Popular"
+msgstr "Populares"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: GroupFavoritedPlugin.php:75
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Popular notices in %s group"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: GroupFavoritedPlugin.php:99
+msgid "This plugin adds a menu item for popular notices in groups."
+msgstr ""
diff --git a/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..3b1ab9e91
--- /dev/null
+++ b/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,65 @@
+# Translation of StatusNet - Mapstraction to Spanish (Español)
+# Expored from translatewiki.net
+#
+# Author: Locos epraix
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:18+0000\n"
+"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:16+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:179
+msgid "Map"
+msgstr "Mapa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:191
+msgid "Full size"
+msgstr ""
+
+#: MapstractionPlugin.php:203
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr ""
+
+#: map.php:79
+msgid "User has no profile."
+msgstr "Usuario no tiene perfil."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:69
+#, php-format
+msgid "%s friends map"
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#: allmap.php:75
+#, php-format
+msgid "%1$s friends map, page %2$d"
+msgstr ""
+
+#: usermap.php:68
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 000000000..e9e6b6313
--- /dev/null
+++ b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,64 @@
+# Translation of StatusNet - Mapstraction to Telugu (తెలుగు)
+# Expored from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:19+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:16+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-mapstraction\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MapstractionPlugin.php:179
+msgid "Map"
+msgstr "పటం"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+#: MapstractionPlugin.php:191
+msgid "Full size"
+msgstr "పూర్తి పరిమాణం"
+
+#: MapstractionPlugin.php:203
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+
+#: map.php:72
+msgid "No such user."
+msgstr ""
+
+#: map.php:79
+msgid "User has no profile."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#: allmap.php:69
+#, php-format
+msgid "%s friends map"
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#: allmap.php:75
+#, php-format
+msgid "%1$s friends map, page %2$d"
+msgstr ""
+
+#: usermap.php:68
+#, php-format
+msgid "%s map, page %d"
+msgstr ""
diff --git a/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po
new file mode 100644
index 000000000..3a18c2f91
--- /dev/null
+++ b/plugins/Meteor/locale/br/LC_MESSAGES/Meteor.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Meteor to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Meteor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:21+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:18+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-meteor\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Exception. %1$s is the control server, %2$s is the control port.
+#: MeteorPlugin.php:115
+#, php-format
+msgid "Couldn't connect to %1$s on %2$s."
+msgstr "Dibosupl eo kevreañ ouzh %1$s war %2$s."
+
+#. TRANS: Exception. %s is the Meteor message that could not be added.
+#: MeteorPlugin.php:128
+#, php-format
+msgid "Error adding meteor message \"%s\""
+msgstr ""
+
+#: MeteorPlugin.php:158
+msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
+msgstr ""
diff --git a/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 000000000..68091bd5b
--- /dev/null
+++ b/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - MobileProfile to Spanish (Español)
+# Expored from translatewiki.net
+#
+# Author: Locos epraix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:23+0000\n"
+"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:19+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MobileProfilePlugin.php:193
+msgid "This page is not available in a media type you accept."
+msgstr ""
+
+#: MobileProfilePlugin.php:310
+msgid "Home"
+msgstr ""
+
+#: MobileProfilePlugin.php:312
+msgid "Account"
+msgstr "Cuenta"
+
+#: MobileProfilePlugin.php:314
+msgid "Connect"
+msgstr "Conectar"
+
+#: MobileProfilePlugin.php:317
+msgid "Admin"
+msgstr ""
+
+#: MobileProfilePlugin.php:317
+msgid "Change site configuration"
+msgstr ""
+
+#: MobileProfilePlugin.php:321
+msgid "Invite"
+msgstr "Invitar"
+
+#: MobileProfilePlugin.php:324
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+#: MobileProfilePlugin.php:328
+msgid "Register"
+msgstr ""
+
+#: MobileProfilePlugin.php:331
+msgid "Login"
+msgstr ""
+
+#: MobileProfilePlugin.php:335
+msgid "Search"
+msgstr ""
+
+#: MobileProfilePlugin.php:361
+msgid "Attach"
+msgstr ""
+
+#: MobileProfilePlugin.php:365
+msgid "Attach a file"
+msgstr ""
+
+#: MobileProfilePlugin.php:417
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr ""
diff --git a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 000000000..28d74d481
--- /dev/null
+++ b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - MobileProfile to Pashto (پښتو)
+# Expored from translatewiki.net
+#
+# Author: Ahmed-Najib-Biabani-Ibrahimkhel
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:23+0000\n"
+"Language-Team: Pashto <http://translatewiki.net/wiki/Portal:ps>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:19+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ps\n"
+"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MobileProfilePlugin.php:193
+msgid "This page is not available in a media type you accept."
+msgstr ""
+
+#: MobileProfilePlugin.php:310
+msgid "Home"
+msgstr "کور"
+
+#: MobileProfilePlugin.php:312
+msgid "Account"
+msgstr ""
+
+#: MobileProfilePlugin.php:314
+msgid "Connect"
+msgstr ""
+
+#: MobileProfilePlugin.php:317
+msgid "Admin"
+msgstr ""
+
+#: MobileProfilePlugin.php:317
+msgid "Change site configuration"
+msgstr ""
+
+#: MobileProfilePlugin.php:321
+msgid "Invite"
+msgstr ""
+
+#: MobileProfilePlugin.php:324
+msgid "Logout"
+msgstr "وتل"
+
+#: MobileProfilePlugin.php:328
+msgid "Register"
+msgstr ""
+
+#: MobileProfilePlugin.php:331
+msgid "Login"
+msgstr "ننوتل"
+
+#: MobileProfilePlugin.php:335
+msgid "Search"
+msgstr "پلټل"
+
+#: MobileProfilePlugin.php:361
+msgid "Attach"
+msgstr ""
+
+#: MobileProfilePlugin.php:365
+msgid "Attach a file"
+msgstr ""
+
+#: MobileProfilePlugin.php:417
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr ""
diff --git a/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po
new file mode 100644
index 000000000..924e4039e
--- /dev/null
+++ b/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po
@@ -0,0 +1,756 @@
+# Translation of StatusNet - OStatus to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:02+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-ostatus\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Link description for link to subscribe to a remote user.
+#. TRANS: Link text for a user to subscribe to an OStatus user.
+#: OStatusPlugin.php:225 OStatusPlugin.php:935
+msgid "Subscribe"
+msgstr "Koumanantiñ"
+
+#. TRANS: Link description for link to join a remote group.
+#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+msgid "Join"
+msgstr "Stagañ"
+
+#. TRANSLATE: %s is a domain.
+#: OStatusPlugin.php:457
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr "Kaset adalek %s dre OStatus"
+
+#. TRANS: Exception.
+#: OStatusPlugin.php:529
+msgid "Could not set up remote subscription."
+msgstr ""
+
+#: OStatusPlugin.php:603
+msgid "Unfollow"
+msgstr "Chom hep heuliañ"
+
+#. TRANS: Success message for unsubscribe from user attempt through OStatus.
+#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+#: OStatusPlugin.php:606
+#, php-format
+msgid "%1$s stopped following %2$s."
+msgstr ""
+
+#: OStatusPlugin.php:634
+msgid "Could not set up remote group membership."
+msgstr ""
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: OStatusPlugin.php:656
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
+#. TRANS: Exception.
+#: OStatusPlugin.php:665
+msgid "Failed joining remote group."
+msgstr ""
+
+#: OStatusPlugin.php:705
+msgid "Leave"
+msgstr "Kuitaat"
+
+#. TRANS: Success message for unsubscribe from group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+#: OStatusPlugin.php:708
+#, php-format
+msgid "%1$s has left group %2$s."
+msgstr ""
+
+#: OStatusPlugin.php:783
+msgid "Disfavor"
+msgstr ""
+
+#. TRANS: Success message for remove a favorite notice through OStatus.
+#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+#: OStatusPlugin.php:786
+#, php-format
+msgid "%1$s marked notice %2$s as no longer a favorite."
+msgstr ""
+
+#. TRANS: Link text for link to remote subscribe.
+#: OStatusPlugin.php:862
+msgid "Remote"
+msgstr ""
+
+#. TRANS: Title for activity.
+#: OStatusPlugin.php:902
+msgid "Profile update"
+msgstr ""
+
+#. TRANS: Ping text for remote profile update through OStatus.
+#. TRANS: %s is user that updated their profile.
+#: OStatusPlugin.php:905
+#, php-format
+msgid "%s has updated their profile page."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OStatusPlugin.php:950
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
+msgstr ""
+
+#: classes/FeedSub.php:252
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+
+#: classes/FeedSub.php:282
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:192
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:195
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#: classes/Ostatus_profile.php:285
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:378
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
+msgid "Unknown feed format."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
+msgid "RSS feed without a channel."
+msgstr ""
+
+#. TRANS: Client exception.
+#: classes/Ostatus_profile.php:478
+msgid "Can't handle that kind of post."
+msgstr ""
+
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
+#, php-format
+msgid "No content for notice %s."
+msgstr ""
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
+msgid "Show more"
+msgstr "Diskouez muioc'h"
+
+#. TRANS: Exception. %s is a profile URL.
+#: classes/Ostatus_profile.php:789
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr ""
+
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1292
+msgid "Local user can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1297
+msgid "Local group can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+msgid "Can't save local profile."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
+msgid "Can't save OStatus profile."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
+msgid "Not a valid webfinger address."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1737
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1756
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1764
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#: classes/HubSub.php:212
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#: classes/HubSub.php:359
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr ""
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: lib/salmonaction.php:42
+msgid "This method requires a POST."
+msgstr ""
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+#: lib/salmonaction.php:47
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:57
+msgid "Salmon signature verification failed."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:69
+msgid "Salmon post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:118
+msgid "Unrecognized activity type."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:127
+msgid "This target doesn't understand posts."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:133
+msgid "This target doesn't understand follows."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:139
+msgid "This target doesn't understand unfollows."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:145
+msgid "This target doesn't understand favorites."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:151
+msgid "This target doesn't understand unfavorites."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:157
+msgid "This target doesn't understand share events."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:163
+msgid "This target doesn't understand joins."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:169
+msgid "This target doesn't understand leave events."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmonaction.php:197
+msgid "Received a salmon slap from unidentified actor."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/discovery.php:110
+#, php-format
+msgid "Unable to find services for %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/magicenvelope.php:80
+msgid "Unable to locate signer public key."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmon.php:93
+msgid "Salmon invalid actor for signing."
+msgstr ""
+
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
+msgstr "Lanvioù"
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:70
+msgid "Publishing outside feeds not supported."
+msgstr ""
+
+#. TRANS: Client exception. %s is a mode.
+#: actions/pushhub.php:73
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %s is a topic.
+#: actions/pushhub.php:93
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:99
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:105
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:113
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:165
+#, php-format
+msgid "Invalid hub.topic \"%s\". User doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:174
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#: actions/pushhub.php:199
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr ""
+
+#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "No such user."
+msgstr "N'eus ket eus an implijer-se."
+
+#. TRANS: Client error.
+#: actions/usersalmon.php:37 actions/groupsalmon.php:40
+msgid "No ID."
+msgstr "ID ebet"
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:81
+msgid "In reply to unknown notice."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:86
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:163
+msgid "Could not save new favorite."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:195
+msgid "Can't favorite/unfavorite without an object."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:207
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+
+#. TRANS: Client exception. %s is an object ID.
+#: actions/usersalmon.php:214
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr ""
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#: actions/usersalmon.php:219
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusgroup.php:78
+msgid "Join group"
+msgstr "Mont er strollad"
+
+#. TRANS: Tooltip for field label "Join group".
+#: actions/ostatusgroup.php:81
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Kenderc'hel"
+
+#: actions/ostatusgroup.php:105
+msgid "You are already a member of this group."
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:140
+msgid "Already a member!"
+msgstr "Ezel oc'h dija !"
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:151
+msgid "Remote group join failed!"
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:155
+msgid "Remote group join aborted!"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote group join form
+#: actions/ostatusgroup.php:167
+msgid "Confirm joining remote group"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatusgroup.php:178
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:47
+msgid "No such group."
+msgstr "N'eus ket eus ar strollad-se."
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:53
+msgid "Can't accept remote posts for a remote group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:127
+msgid "Can't read profile to set up group membership."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+msgid "Groups can't join groups."
+msgstr ""
+
+#: actions/groupsalmon.php:144
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:159
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+
+#: actions/groupsalmon.php:171
+msgid "Can't read profile to cancel group membership."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:188
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr ""
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+#: actions/ostatussub.php:68
+msgid "Subscribe to"
+msgstr "Koumanantiñ da"
+
+#. TRANS: Tooltip for field label "Subscribe to".
+#: actions/ostatussub.php:71
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname"
+msgstr ""
+
+#. TRANS: Button text.
+#. TRANS: Tooltip for button "Join".
+#: actions/ostatussub.php:112
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr "Mont er strollad-se"
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:115
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Tooltip for button "Confirm".
+#: actions/ostatussub.php:117
+msgid "Subscribe to this user"
+msgstr ""
+
+#: actions/ostatussub.php:138
+msgid "You are already subscribed to this user."
+msgstr ""
+
+#: actions/ostatussub.php:167
+msgid "Photo"
+msgstr "Skeudenn"
+
+#: actions/ostatussub.php:178
+msgid "Nickname"
+msgstr "Lesanv"
+
+#: actions/ostatussub.php:199
+msgid "Location"
+msgstr "Lec'hiadur"
+
+#: actions/ostatussub.php:208
+msgid "URL"
+msgstr "URL"
+
+#: actions/ostatussub.php:220
+msgid "Note"
+msgstr "Notenn"
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:256 actions/ostatussub.php:263
+#: actions/ostatussub.php:288
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:267 actions/ostatussub.php:271
+#: actions/ostatussub.php:275 actions/ostatussub.php:279
+#: actions/ostatussub.php:283
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:317
+msgid "Already subscribed!"
+msgstr "Koumanantet dija !"
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:322
+msgid "Remote subscription failed!"
+msgstr ""
+
+#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Form title.
+#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+msgid "Subscribe to user"
+msgstr "En em goumanantiñ d'un implijer"
+
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:417
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:429
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:42
+msgid "You can use the local subscription!"
+msgstr ""
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:98
+#, php-format
+msgid "Join group %s"
+msgstr "Mont er strollad %s"
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:100
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Stagañ"
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:103
+#, php-format
+msgid "Subscribe to %s"
+msgstr "Koumanantiñ da %s"
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:105
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Koumanantiñ"
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:118
+msgid "User nickname"
+msgstr "Lesanv an implijer"
+
+#: actions/ostatusinit.php:119
+msgid "Nickname of the user you want to follow."
+msgstr "Lesanv an implijer ho peus c'hoant heuliañ."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:124
+msgid "Profile Account"
+msgstr "Kont profil"
+
+#. TRANS: Tooltip for field label "Profile Account".
+#: actions/ostatusinit.php:126
+msgid "Your account id (e.g. user@identi.ca)."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:148
+msgid "Must provide a remote profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:160
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:173
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/ostatusinit.php:218
+msgid "OStatus Connect"
+msgstr ""
+
+#: actions/pushcallback.php:50
+msgid "Empty or invalid feed id."
+msgstr ""
+
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:56
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#: actions/pushcallback.php:101
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:108
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:113
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr ""
diff --git a/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
new file mode 100644
index 000000000..48874e907
--- /dev/null
+++ b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
@@ -0,0 +1,756 @@
+# Translation of StatusNet - OStatus to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:02+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-ostatus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Link description for link to subscribe to a remote user.
+#. TRANS: Link text for a user to subscribe to an OStatus user.
+#: OStatusPlugin.php:225 OStatusPlugin.php:935
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Link description for link to join a remote group.
+#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANSLATE: %s is a domain.
+#: OStatusPlugin.php:457
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr ""
+
+#. TRANS: Exception.
+#: OStatusPlugin.php:529
+msgid "Could not set up remote subscription."
+msgstr ""
+
+#: OStatusPlugin.php:603
+msgid "Unfollow"
+msgstr ""
+
+#. TRANS: Success message for unsubscribe from user attempt through OStatus.
+#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+#: OStatusPlugin.php:606
+#, php-format
+msgid "%1$s stopped following %2$s."
+msgstr ""
+
+#: OStatusPlugin.php:634
+msgid "Could not set up remote group membership."
+msgstr ""
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: OStatusPlugin.php:656
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
+#. TRANS: Exception.
+#: OStatusPlugin.php:665
+msgid "Failed joining remote group."
+msgstr ""
+
+#: OStatusPlugin.php:705
+msgid "Leave"
+msgstr "Deixar"
+
+#. TRANS: Success message for unsubscribe from group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+#: OStatusPlugin.php:708
+#, php-format
+msgid "%1$s has left group %2$s."
+msgstr ""
+
+#: OStatusPlugin.php:783
+msgid "Disfavor"
+msgstr ""
+
+#. TRANS: Success message for remove a favorite notice through OStatus.
+#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+#: OStatusPlugin.php:786
+#, php-format
+msgid "%1$s marked notice %2$s as no longer a favorite."
+msgstr ""
+
+#. TRANS: Link text for link to remote subscribe.
+#: OStatusPlugin.php:862
+msgid "Remote"
+msgstr ""
+
+#. TRANS: Title for activity.
+#: OStatusPlugin.php:902
+msgid "Profile update"
+msgstr "Actualización do perfil"
+
+#. TRANS: Ping text for remote profile update through OStatus.
+#. TRANS: %s is user that updated their profile.
+#: OStatusPlugin.php:905
+#, php-format
+msgid "%s has updated their profile page."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OStatusPlugin.php:950
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
+msgstr ""
+
+#: classes/FeedSub.php:252
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+
+#: classes/FeedSub.php:282
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:192
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:195
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#: classes/Ostatus_profile.php:285
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:378
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
+msgid "Unknown feed format."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
+msgid "RSS feed without a channel."
+msgstr ""
+
+#. TRANS: Client exception.
+#: classes/Ostatus_profile.php:478
+msgid "Can't handle that kind of post."
+msgstr ""
+
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
+#, php-format
+msgid "No content for notice %s."
+msgstr ""
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
+msgid "Show more"
+msgstr "Mostrar máis"
+
+#. TRANS: Exception. %s is a profile URL.
+#: classes/Ostatus_profile.php:789
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr ""
+
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1292
+msgid "Local user can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1297
+msgid "Local group can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+msgid "Can't save local profile."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
+msgid "Can't save OStatus profile."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
+msgid "Not a valid webfinger address."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1737
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1756
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1764
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#: classes/HubSub.php:212
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#: classes/HubSub.php:359
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr ""
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: lib/salmonaction.php:42
+msgid "This method requires a POST."
+msgstr ""
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+#: lib/salmonaction.php:47
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:57
+msgid "Salmon signature verification failed."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:69
+msgid "Salmon post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:118
+msgid "Unrecognized activity type."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:127
+msgid "This target doesn't understand posts."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:133
+msgid "This target doesn't understand follows."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:139
+msgid "This target doesn't understand unfollows."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:145
+msgid "This target doesn't understand favorites."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:151
+msgid "This target doesn't understand unfavorites."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:157
+msgid "This target doesn't understand share events."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:163
+msgid "This target doesn't understand joins."
+msgstr ""
+
+#. TRANS: Client exception.
+#: lib/salmonaction.php:169
+msgid "This target doesn't understand leave events."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmonaction.php:197
+msgid "Received a salmon slap from unidentified actor."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/discovery.php:110
+#, php-format
+msgid "Unable to find services for %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/magicenvelope.php:80
+msgid "Unable to locate signer public key."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmon.php:93
+msgid "Salmon invalid actor for signing."
+msgstr ""
+
+#: tests/gettext-speedtest.php:57
+msgid "Feeds"
+msgstr "Fontes de novas"
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:70
+msgid "Publishing outside feeds not supported."
+msgstr ""
+
+#. TRANS: Client exception. %s is a mode.
+#: actions/pushhub.php:73
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %s is a topic.
+#: actions/pushhub.php:93
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:99
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:105
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:113
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:165
+#, php-format
+msgid "Invalid hub.topic \"%s\". User doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/pushhub.php:174
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group doesn't exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#: actions/pushhub.php:199
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr ""
+
+#: actions/ownerxrd.php:39 actions/usersalmon.php:43
+msgid "No such user."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/usersalmon.php:37 actions/groupsalmon.php:40
+msgid "No ID."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:81
+msgid "In reply to unknown notice."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:86
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:163
+msgid "Could not save new favorite."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:195
+msgid "Can't favorite/unfavorite without an object."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/usersalmon.php:207
+msgid "Can't handle that kind of object for liking/faving."
+msgstr ""
+
+#. TRANS: Client exception. %s is an object ID.
+#: actions/usersalmon.php:214
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr ""
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#: actions/usersalmon.php:219
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusgroup.php:78
+msgid "Join group"
+msgstr "Unirse ao grupo"
+
+#. TRANS: Tooltip for field label "Join group".
+#: actions/ostatusgroup.php:81
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+
+#. TRANS: Button text.
+#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#: actions/ostatusgroup.php:105
+msgid "You are already a member of this group."
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:140
+msgid "Already a member!"
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:151
+msgid "Remote group join failed!"
+msgstr ""
+
+#. TRANS: OStatus remote group subscription dialog error.
+#: actions/ostatusgroup.php:155
+msgid "Remote group join aborted!"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote group join form
+#: actions/ostatusgroup.php:167
+msgid "Confirm joining remote group"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatusgroup.php:178
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:47
+msgid "No such group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:53
+msgid "Can't accept remote posts for a remote group."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:127
+msgid "Can't read profile to set up group membership."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+msgid "Groups can't join groups."
+msgstr ""
+
+#: actions/groupsalmon.php:144
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:159
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr ""
+
+#: actions/groupsalmon.php:171
+msgid "Can't read profile to cancel group membership."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#: actions/groupsalmon.php:188
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr ""
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+#: actions/ostatussub.php:68
+msgid "Subscribe to"
+msgstr "Subscribirse a"
+
+#. TRANS: Tooltip for field label "Subscribe to".
+#: actions/ostatussub.php:71
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname"
+msgstr ""
+
+#. TRANS: Button text.
+#. TRANS: Tooltip for button "Join".
+#: actions/ostatussub.php:112
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr "Unirse a este grupo"
+
+#. TRANS: Button text.
+#: actions/ostatussub.php:115
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Tooltip for button "Confirm".
+#: actions/ostatussub.php:117
+msgid "Subscribe to this user"
+msgstr "Subscribirse a este usuario"
+
+#: actions/ostatussub.php:138
+msgid "You are already subscribed to this user."
+msgstr "Xa está subscrito a este usuario."
+
+#: actions/ostatussub.php:167
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/ostatussub.php:178
+msgid "Nickname"
+msgstr "Alcume"
+
+#: actions/ostatussub.php:199
+msgid "Location"
+msgstr "Localización"
+
+#: actions/ostatussub.php:208
+msgid "URL"
+msgstr "URL"
+
+#: actions/ostatussub.php:220
+msgid "Note"
+msgstr "Nota"
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:256 actions/ostatussub.php:263
+#: actions/ostatussub.php:288
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+
+#. TRANS: Error text.
+#: actions/ostatussub.php:267 actions/ostatussub.php:271
+#: actions/ostatussub.php:275 actions/ostatussub.php:279
+#: actions/ostatussub.php:283
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:317
+msgid "Already subscribed!"
+msgstr "Xa está subscrito!"
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:322
+msgid "Remote subscription failed!"
+msgstr ""
+
+#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Form title.
+#: actions/ostatussub.php:397 actions/ostatusinit.php:83
+msgid "Subscribe to user"
+msgstr "Subscribirse ao usuario"
+
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:417
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:429
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:42
+msgid "You can use the local subscription!"
+msgstr "Pode usar a subscrición local!"
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:98
+#, php-format
+msgid "Join group %s"
+msgstr "Unirse ao grupo \"%s\""
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:100
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Form legend.
+#: actions/ostatusinit.php:103
+#, php-format
+msgid "Subscribe to %s"
+msgstr "Subscribirse a %s"
+
+#. TRANS: Button text.
+#: actions/ostatusinit.php:105
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:118
+msgid "User nickname"
+msgstr "Alcume do usuario"
+
+#: actions/ostatusinit.php:119
+msgid "Nickname of the user you want to follow."
+msgstr "Alcume do usuario ao que quere seguir."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:124
+msgid "Profile Account"
+msgstr "Conta de perfil"
+
+#. TRANS: Tooltip for field label "Profile Account".
+#: actions/ostatusinit.php:126
+msgid "Your account id (e.g. user@identi.ca)."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:148
+msgid "Must provide a remote profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:160
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:173
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/ostatusinit.php:218
+msgid "OStatus Connect"
+msgstr ""
+
+#: actions/pushcallback.php:50
+msgid "Empty or invalid feed id."
+msgstr ""
+
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:56
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#: actions/pushcallback.php:101
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:108
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:113
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr ""
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 6975dbaea..90c0ccebc 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -456,39 +456,34 @@ msgstr ""
msgid "Not a valid invitation code."
msgstr ""
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr ""
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr ""
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr ""
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr ""
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr ""
diff --git a/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..03a104d2d
--- /dev/null
+++ b/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po
@@ -0,0 +1,589 @@
+# Translation of StatusNet - OpenID to Arabic (العربية)
+# Expored from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:34+0000\n"
+"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr "إعدادات الهوية المفتوحة"
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"تمكنك [الهوية المفتوحة](%%doc.openid%%) من الولوج إلى مواقع كثيرة بنفس حساب "
+"المستخدم. أدر هوياتك المفتوحة هنا."
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr "أضف هوية مفتوحة"
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"إذا أردت إضافة هوية مفتوحة إلى حسابك، أدخلها إلى الصندوق أدناه وانقر \"أضف\"."
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr "مسار الهوية المفتوحة"
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "أضف"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr "أزل الهوية المفتوحة"
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"إن حذف هويتك المفتوحة الوحيدة سيجعل من المستحيل الولوج! إذا أردت إضافة هذه "
+"فأضف هوية مفتوحة أخرى أولا."
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr "يمكنك إزالة هوية مفتوحة من حسابك بنفر الزر المُعلّم \"أزل\"."
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "أزل"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr "مواقع الهوية المفتوحة الموثوقة"
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"يسمح للمواقع التالية بالوصول إلى هويتك والولوج بها. يمكنك إزالة موقع من "
+"القائمة لمنعه من الوصول إلى هويتك المفتوحة."
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr "لا هوية مفتوحة كهذه."
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr "تلك الهوية المفتوحة ليست لك."
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr "أزيلت الهوية المفتوحة."
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr "الهوية المفتوحة"
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr "مسار المزود غير صالح. أقصى طول 255 حرف."
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr "اسم فريق غير صالح. أقصى طول 255 حرف."
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr "مزود موثوق"
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr ""
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "ساعدني!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr ""
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr ""
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "استمر"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "أدخل اسم مستخدمك."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "أنشئ حسابًا جديدًا"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr ""
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr ""
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "كلمة السر"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr ""
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "تذكرني"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "استمر"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "ألغِ"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr ""
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..c17aab71c
--- /dev/null
+++ b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
@@ -0,0 +1,582 @@
+# Translation of StatusNet - OpenID to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr "Ouzhpennañ OpenID"
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr ""
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "Dilemel"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr "OpenID"
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr "Skipailh ret"
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr "Dibarzhioù"
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr "Ur fazi 'zo bet pa veze enrollet ar profil."
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr "Ur fazi 'zo bet pa veze enrollet an implijer."
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Kevreañ d'al lec'hienn"
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr "Kevreañ"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Sikour din !"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr "Skoazell"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr "Klask tud pe un tamm testenn"
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr "Klask"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr "Kefluniadur OpenID"
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Kenderc'hel"
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Ebarzhit hoc'h anv implijer"
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+"Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
+"gont."
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr "Ur gudenn dizanv a zo bet."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "Krouiñ ur gont nevez"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr "Krouiñ un implijer nevez gant al lesanv-se."
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr "Lesanv nevez"
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Krouiñ"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr "Lesanv a zo dioutañ"
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Ger-tremen"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Kevreañ"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr "N'eo ket aotreet krouiñ kontoù."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr "N'eo ket reizh ar c'hod pedadenn."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Kevreañ gant ur gont [OpenID](%%doc.openid%%)."
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Derc'hel soñj ac'hanon"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Kevreañ"
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Kenderc'hel"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "Nullañ"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr "Nann-kevreet."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr ""
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 52c847155..754338e56 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:59+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -472,41 +472,35 @@ msgstr "No es permet el registre."
msgid "Not a valid invitation code."
msgstr "No és un codi d'invitació vàlid."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"El sobrenom ha de contenir només lletres minúscules i nombres, i cap espai."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "No es permet el sobrenom."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "No s'ha trobat la connexió OpenID emmagatzemada."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr ""
"S'està creant un compte nou per a una connexió OpenID que ja té un usuari."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "El nom d'usuari o la contrasenya no són vàlids."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
@@ -604,3 +598,8 @@ msgstr "S'ha produït un error en connectar l'usuari"
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "S'ha produït un error en actualitzar el perfil"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "El sobrenom ha de contenir només lletres minúscules i nombres, i cap "
+#~ "espai."
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index 70758ed1c..7210ff77f 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:41:47+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:13:53+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -498,41 +498,34 @@ msgstr "Registrierung nicht erlaubt."
msgid "Not a valid invitation code."
msgstr "Kein gültiger Einladungscode."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
-"Leerzeichen sind nicht erlaubt."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Benutzername nicht erlaubt."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr ""
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr ""
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr ""
@@ -627,3 +620,8 @@ msgstr ""
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+#~ "Leerzeichen sind nicht erlaubt."
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index d20835cbf..e098843f3 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:59+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -508,41 +508,34 @@ msgstr "Inscription non autorisée."
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
-"chiffres, sans espaces."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "OpenID stocké non trouvé."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr "Créer un nouveau compte pour OpenID qui a déjà un utilisateur."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "Erreur de connexion de l’utilisateur à OpenID."
@@ -641,3 +634,8 @@ msgstr "Erreur lors de la connexion de l’utilisateur à OpenID."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Erreur lors de la mise à jour du profil utilisateur"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
+#~ "chiffres, sans espaces."
diff --git a/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..f19e25af7
--- /dev/null
+++ b/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po
@@ -0,0 +1,582 @@
+# Translation of StatusNet - OpenID to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr ""
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr ""
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "Engadir"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "Eliminar"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr "OpenID"
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr "Opcións"
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Identificarse no sitio"
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr "Rexistro"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Axuda!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr "Axuda"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr "Buscar persoas ou palabras"
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr "Procurar"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr "Configuración do OpenID"
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr "Xa se identificou."
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "Crear unha conta nova"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr "Crear un novo usuario con este alcume."
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr "Novo alcume"
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+"espazos, tiles ou eñes"
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Contrasinal"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectarse"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr "O nome de usuario ou contrasinal non son correctos."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Lembrádeme"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Acceder ao sistema"
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Continuar"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr ""
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 68e4e32e2..eeddda783 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -498,39 +498,34 @@ msgstr "Creation de conto non permittite."
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "Le OpenID immagazinate non esseva trovate."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr "Tentativa de crear un nove conto pro un OpenID que ha jam un usator."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "Error durante le connexion del usator a OpenID."
@@ -628,3 +623,7 @@ msgstr "Error durante le connexion del usator."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Error durante le actualisation del profilo"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index 851239175..e0eb77175 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:35+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -494,39 +494,34 @@ msgstr "Регистрацијата не е дозволена."
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "Складираниот OpenID не е пронајден."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr "Создавање на сметка за OpenID што веќе има корисник."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "Грешка при поврзувањето на корисникот со OpenID."
@@ -623,3 +618,7 @@ msgstr "Грешка при поврзувањето на корисникот."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Грешка при подновувањето на профилот"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Прекарот мора да има само мали букви и бројки и да нема празни места."
diff --git a/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..c99c9fb67
--- /dev/null
+++ b/plugins/OpenID/locale/nb/LC_MESSAGES/OpenID.po
@@ -0,0 +1,580 @@
+# Translation of StatusNet - OpenID to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:36+0000\n"
+"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr "Legg til OpenID"
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr "OpenID-adresse"
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "Legg til"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr "Fjern OpenID"
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "Fjern"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr "Ingen slik OpenID."
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr "OpenID fjernet."
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr "OpenID"
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr ""
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Hjelp meg."
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hjelp"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr "Søk etter personer eller tekst"
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr "Søk"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr ""
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Skriv inn brukernavnet ditt."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr "Allerede innlogget."
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "Opprett ny konto"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr "Opprett en ny bruker med dette kallenavnet."
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr "Nytt kallenavn"
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Opprett"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Passord"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Koble til"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Husk meg"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Fortsett"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr ""
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index d2bf563cd..09940c2c3 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,16 +10,16 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:36+0000\n"
"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -500,41 +500,34 @@ msgstr "Registreren is niet mogelijk."
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is niet geldig."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen "
-"spaties bevatten."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Deze gebruikersnaam is niet toegestaan."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "Het opgeslagen OpenID is niet aangetroffen."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr "Poging tot aanmaken van een OpenID-account dat al een gebruiker heeft."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "Fout bij het koppelen met OpenID."
@@ -632,3 +625,8 @@ msgstr "Fout bij het verbinden met de gebruiker."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Fout bij het bijwerken van het profiel."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en "
+#~ "geen spaties bevatten."
diff --git a/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..0c0f04f9e
--- /dev/null
+++ b/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po
@@ -0,0 +1,586 @@
+# Translation of StatusNet - OpenID to Brazilian Portuguese (Português do Brasil)
+# Expored from translatewiki.net
+#
+# Author: Luckas Blade
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:36+0000\n"
+"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
+"br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt-br\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr ""
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr ""
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr "Adicionar"
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr "Remover"
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr "OpenID"
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr "Opções"
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Não foi possível redirecionar para o servidor: %s"
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr "Erro ao salvar o perfil."
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr "Erro ao salvar o usuário."
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr "Entrar"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr ""
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr "Pesquisar"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr "Adicionar ou remover OpenIDs"
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr ""
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr "Introduza seu nome de usuário."
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+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."
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr "Ocorreu um erro desconhecido."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "Criar nova conta"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr "Novo nome"
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Criar"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Senha"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr "O código de convite é inválido."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr "Nome não permitido."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr "Este nome já está em uso. Tente outro."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr "Nome de usuário e/ou senha inválido(s)."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Lembrar-me"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Entrar"
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr ""
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Continuar"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "O nome deve conter apenas letras minúsculas e números e não pode ter "
+#~ "espaços."
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index e820e9514..c3ee0e652 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:36+0000\n"
"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -511,42 +511,35 @@ msgstr "Hindi pinayagan ang pagpapatala."
msgid "Not a valid invitation code."
msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ang palayaw ay dapat lamang na may maliliit ng mga titik at mga bilang at "
-"walang mga patlang."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Hindi pinayagan ang palayaw."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Ginagamit na ang palayaw. Sumubok ng iba."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "Hindi natagpuan ang nakalagak na OpenID."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr ""
"Nililikha ang bagong akawnt para sa OpenID na mayroon nang isang tagagamit."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
@@ -644,3 +637,8 @@ msgstr "Kamalian sa pag-ugnay ng tagagamit."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Kamalian sa pagsasapanahon ng balangkas"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ang palayaw ay dapat lamang na may maliliit ng mga titik at mga bilang at "
+#~ "walang mga patlang."
diff --git a/plugins/OpenID/locale/tr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tr/LC_MESSAGES/OpenID.po
new file mode 100644
index 000000000..90d8fbd57
--- /dev/null
+++ b/plugins/OpenID/locale/tr/LC_MESSAGES/OpenID.po
@@ -0,0 +1,594 @@
+# Translation of StatusNet - OpenID to Turkish (Türkçe)
+# Expored from translatewiki.net
+#
+# Author: Maidis
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:36+0000\n"
+"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: openidsettings.php:58 openidadminpanel.php:65
+msgid "OpenID settings"
+msgstr ""
+
+#: openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: openidsettings.php:100
+msgid "Add OpenID"
+msgstr ""
+
+#: openidsettings.php:103
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field label.
+#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
+msgid "OpenID URL"
+msgstr ""
+
+#: openidsettings.php:118
+msgid "Add"
+msgstr ""
+
+#: openidsettings.php:130
+msgid "Remove OpenID"
+msgstr ""
+
+#: openidsettings.php:135
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+
+#: openidsettings.php:150
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: openidsettings.php:173 openidsettings.php:214
+msgid "Remove"
+msgstr ""
+
+#: openidsettings.php:187
+msgid "OpenID Trusted Sites"
+msgstr ""
+
+#: openidsettings.php:190
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: openidsettings.php:239
+msgid "Can't add new providers."
+msgstr ""
+
+#: openidsettings.php:252
+msgid "Something weird happened."
+msgstr ""
+
+#: openidsettings.php:276
+msgid "No such OpenID trustroot."
+msgstr ""
+
+#: openidsettings.php:280
+msgid "Trustroots removed"
+msgstr ""
+
+#: openidsettings.php:303
+msgid "No such OpenID."
+msgstr ""
+
+#: openidsettings.php:308
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: openidsettings.php:312
+msgid "OpenID removed."
+msgstr ""
+
+#: openidadminpanel.php:54
+msgid "OpenID"
+msgstr ""
+
+#: openidadminpanel.php:147
+msgid "Invalid provider URL. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:153
+msgid "Invalid team name. Max length is 255 characters."
+msgstr ""
+
+#: openidadminpanel.php:210
+msgid "Trusted provider"
+msgstr ""
+
+#: openidadminpanel.php:212
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+
+#: openidadminpanel.php:220
+msgid "Provider URL"
+msgstr ""
+
+#: openidadminpanel.php:221
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+
+#: openidadminpanel.php:228
+msgid "Append a username to base URL"
+msgstr ""
+
+#: openidadminpanel.php:230
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+
+#: openidadminpanel.php:238
+msgid "Required team"
+msgstr ""
+
+#: openidadminpanel.php:239
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+
+#: openidadminpanel.php:251
+msgid "Options"
+msgstr ""
+
+#: openidadminpanel.php:258
+msgid "Enable OpenID-only mode"
+msgstr ""
+
+#: openidadminpanel.php:260
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+
+#: openidadminpanel.php:278
+msgid "Save OpenID settings"
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:138
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+#: openid.php:150
+msgid "Not a valid OpenID."
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#: openid.php:155
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#: openid.php:205
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#. TRANS: OpenID plugin user instructions.
+#: openid.php:244
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:280
+msgid "Error saving the profile."
+msgstr ""
+
+#. TRANS: OpenID plugin server error.
+#: openid.php:292
+msgid "Error saving the user."
+msgstr ""
+
+#. TRANS: OpenID plugin client exception (403).
+#: openid.php:322
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+
+#. TRANS: Title
+#: openid.php:370
+msgid "OpenID Login Submission"
+msgstr ""
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+#: openid.php:381
+msgid "Requesting authorization from your login provider..."
+msgstr ""
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+#: openid.php:385
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Login"
+#: OpenIDPlugin.php:218
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr ""
+
+#. TRANS: Main menu option when not logged in to log in
+#: OpenIDPlugin.php:221
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Help"
+#: OpenIDPlugin.php:226
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr ""
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: OpenIDPlugin.php:229
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Search"
+#: OpenIDPlugin.php:235
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: OpenIDPlugin.php:238
+msgctxt "MENU"
+msgid "Search"
+msgstr ""
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
+msgctxt "MENU"
+msgid "OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+#: OpenIDPlugin.php:297
+msgid "Login or register with OpenID"
+msgstr ""
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+#: OpenIDPlugin.php:333
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+#: OpenIDPlugin.php:607
+msgid "OpenID configuration"
+msgstr ""
+
+#. TRANS: OpenID plugin description.
+#: OpenIDPlugin.php:631
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: OpenIDPlugin.php:641
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: OpenIDPlugin.php:658 openidlogin.php:140
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: OpenIDPlugin.php:666 openidlogin.php:148
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:675 openidlogin.php:156
+msgid "Enter your username."
+msgstr ""
+
+#. TRANS: Form guide.
+#: OpenIDPlugin.php:677 openidlogin.php:157
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: OpenIDPlugin.php:684 openidlogin.php:164
+msgid "Your OpenID URL"
+msgstr ""
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#: openidserver.php:116
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr ""
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: openidserver.php:137
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: finishopenidlogin.php:37 openidlogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Message given if user does not agree with the site's license.
+#: finishopenidlogin.php:48
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#. TRANS: Messag given on an unknown error.
+#: finishopenidlogin.php:57
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: finishopenidlogin.php:73
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your OpenID "
+"to a local account. You can either create a new account, or connect with "
+"your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Title
+#: finishopenidlogin.php:80
+msgid "OpenID Account Setup"
+msgstr "OpenID Hesap Kurulumu"
+
+#: finishopenidlogin.php:110
+msgid "Create new account"
+msgstr "Yeni hesap oluştur"
+
+#: finishopenidlogin.php:112
+msgid "Create a new user with this nickname."
+msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."
+
+#: finishopenidlogin.php:115
+msgid "New nickname"
+msgstr "Yeni kullanıcı adı"
+
+#: finishopenidlogin.php:117
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+"verilmez"
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: finishopenidlogin.php:142
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Oluştur"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:148
+msgid "Connect existing account"
+msgstr "Varolan hesaba bağlan"
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:151
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Halihazırda bir hesabınız varsa, OpenID'nizle bağlantı kurmak için kullanıcı "
+"adı ve parolanızla giriş yapın."
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:155
+msgid "Existing nickname"
+msgstr "Varolan kullanıcı adı"
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:159
+msgid "Password"
+msgstr "Parola"
+
+#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+#: finishopenidlogin.php:163
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Bağlan"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: finishopenidlogin.php:176 finishaddopenid.php:90
+msgid "OpenID authentication cancelled."
+msgstr "OpenID kimlik doğrulaması iptal edildi."
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#: finishopenidlogin.php:180 finishaddopenid.php:95
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "OpenID kimlik doğrulaması başarısız oldu: %s"
+
+#: finishopenidlogin.php:200 finishaddopenid.php:111
+msgid ""
+"OpenID authentication aborted: you are not allowed to login to this site."
+msgstr ""
+"OpenID kimlik doğrulaması durduruldu: bu siteye giriş yapmaya izinli "
+"değilsiniz."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: finishopenidlogin.php:252 finishopenidlogin.php:262
+msgid "Registration not allowed."
+msgstr "Kayıt yapılmasına izin verilmiyor."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: finishopenidlogin.php:270
+msgid "Not a valid invitation code."
+msgstr "Geçerli bir davet kodu değil."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+#: finishopenidlogin.php:284
+msgid "Nickname not allowed."
+msgstr "Bu kullanıcı adına izin verilmiyor."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+#: finishopenidlogin.php:290
+msgid "Nickname already in use. Try another one."
+msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
+msgid "Stored OpenID not found."
+msgstr "Kayıtlı OpenID bulunamadı."
+
+#. TRANS: OpenID plugin server error.
+#: finishopenidlogin.php:308
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#. TRANS: OpenID plugin message.
+#: finishopenidlogin.php:373
+msgid "Invalid username or password."
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: finishopenidlogin.php:393
+msgid "Error connecting user to OpenID."
+msgstr "OpenID ile kullanıcı bağlanırken hata oluştu."
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:82
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Güvenlik nedeniyle, lütfen ayarlarınızı değiştirmeden önce [OpenID](%%doc."
+"openid%%) ile yeniden giriş yapınız."
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: openidlogin.php:88
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Bir [OpenID](%%doc.openid%%) hesabı ile giriş yapın."
+
+#. TRANS: OpenID plugin message. Title.
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: openidlogin.php:122 finishaddopenid.php:187
+msgid "OpenID Login"
+msgstr "OpenID Giriş"
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: openidlogin.php:169
+msgid "Remember me"
+msgstr "Beni hatırla"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#: openidlogin.php:171
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Gelecekte otomatik olarak giriş yap; paylaşılan bilgisayarlar için değildir!"
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: openidlogin.php:176
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Giriş"
+
+#: openidtrust.php:52
+msgid "OpenID Identity Verification"
+msgstr "OpenID Kimlik Doğrulama"
+
+#: openidtrust.php:70
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr "Bu sayfa sadece OpenID işleme sırasında ulaşılmalıdır, doğrudan değil."
+
+#: openidtrust.php:118
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your "
+"identity and login without creating a new password."
+msgstr ""
+
+#: openidtrust.php:136
+msgid "Continue"
+msgstr "Devam"
+
+#: openidtrust.php:137
+msgid "Cancel"
+msgstr "İptal"
+
+#. TRANS: Client error message
+#: finishaddopenid.php:68
+msgid "Not logged in."
+msgstr "Giriş yapılmadı."
+
+#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
+#: finishaddopenid.php:122
+msgid "You already have this OpenID!"
+msgstr "Zaten bu OpenID'ye sahipsiniz!"
+
+#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
+#: finishaddopenid.php:125
+msgid "Someone else already has this OpenID."
+msgstr "Başka biri bu OpenID'ye sahip."
+
+#. TRANS: message in case the OpenID object cannot be connected to the user.
+#: finishaddopenid.php:138
+msgid "Error connecting user."
+msgstr "Kullanıcı bağlama hatası."
+
+#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+#: finishaddopenid.php:145
+msgid "Error updating profile"
+msgstr "Profil güncelleme hatası"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Kullanıcı adı sadece küçük harfler ve rakamlardan oluşabilir, boşluk "
+#~ "kullanılamaz."
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 2f13743a3..755d59705 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - OpenID\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:00+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:19:37+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:59:08+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-29 19:44:23+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -501,41 +501,34 @@ msgstr "Реєстрацію не дозволено."
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#. TRANS: OpenID plugin message. The entered new user name did not conform to the requirements.
-#: finishopenidlogin.php:281
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:287
+#: finishopenidlogin.php:284
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
#. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:293
+#: finishopenidlogin.php:290
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:301 finishopenidlogin.php:388
+#: finishopenidlogin.php:298 finishopenidlogin.php:385
msgid "Stored OpenID not found."
msgstr "Збережений OpenID не знайдено."
#. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:311
+#: finishopenidlogin.php:308
msgid "Creating new account for OpenID that already has a user."
msgstr "Створення нового акаунту для OpenID користувачем, який вже існує."
#. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:376
+#: finishopenidlogin.php:373
msgid "Invalid username or password."
msgstr "Невірне ім’я або пароль."
#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:396
+#: finishopenidlogin.php:393
msgid "Error connecting user to OpenID."
msgstr "Помилка при підключенні користувача до OpenID."
@@ -632,3 +625,8 @@ msgstr "Помилка при підключенні користувача."
#: finishaddopenid.php:145
msgid "Error updating profile"
msgstr "Помилка при оновленні профілю"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, "
+#~ "ніяких інтервалів."
diff --git a/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 000000000..a4737fd00
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - PoweredByStatusNet to Spanish (Español)
+# Expored from translatewiki.net
+#
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:07+0000\n"
+"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:13:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
+#: PoweredByStatusNetPlugin.php:51
+#, php-format
+msgid "powered by %s"
+msgstr ""
+
+#: PoweredByStatusNetPlugin.php:53
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: PoweredByStatusNetPlugin.php:66
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
diff --git a/plugins/PoweredByStatusNet/locale/pl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/pl/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 000000000..24c329b8d
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/pl/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - PoweredByStatusNet to Polish (Polski)
+# Expored from translatewiki.net
+#
+# Author: Raven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:07+0000\n"
+"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:13:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
+#: PoweredByStatusNetPlugin.php:51
+#, php-format
+msgid "powered by %s"
+msgstr ""
+
+#: PoweredByStatusNetPlugin.php:53
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: PoweredByStatusNetPlugin.php:66
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
diff --git a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 000000000..2414b39cb
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - PoweredByStatusNet to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:07+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:13:56+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
+#: PoweredByStatusNetPlugin.php:51
+#, php-format
+msgid "powered by %s"
+msgstr ""
+
+#: PoweredByStatusNetPlugin.php:53
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#: PoweredByStatusNetPlugin.php:66
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
diff --git a/plugins/RSSCloud/locale/nb/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/nb/LC_MESSAGES/RSSCloud.po
new file mode 100644
index 000000000..da4118eda
--- /dev/null
+++ b/plugins/RSSCloud/locale/nb/LC_MESSAGES/RSSCloud.po
@@ -0,0 +1,72 @@
+# Translation of StatusNet - RSSCloud to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RSSCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:14+0000\n"
+"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:14:00+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: no\n"
+"X-Message-Group: #out-statusnet-plugin-rsscloud\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RSSCloudRequestNotify.php:90
+msgid "Request must be POST."
+msgstr "Forespørsel må være POST."
+
+#: RSSCloudRequestNotify.php:107
+msgid "Only http-post notifications are supported at this time."
+msgstr ""
+
+#. TRANS: %s is a comma separated list of parameters.
+#: RSSCloudRequestNotify.php:118
+#, php-format
+msgid "The following parameters were missing from the request body: %s."
+msgstr ""
+
+#: RSSCloudRequestNotify.php:124
+msgid ""
+"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"urlN)."
+msgstr ""
+
+#: RSSCloudRequestNotify.php:141
+msgid "Feed subscription failed: Not a valid feed."
+msgstr ""
+
+#: RSSCloudRequestNotify.php:147
+msgid ""
+"Feed subscription failed - notification handler doesn't respond correctly."
+msgstr ""
+
+#: RSSCloudRequestNotify.php:161
+msgid ""
+"Thanks for the subscription. When the feed(s) update(s), you will be "
+"notified."
+msgstr ""
+
+#: LoggingAggregator.php:93
+msgid "This resource requires an HTTP GET."
+msgstr "Denne ressursen krever en HTTP GET."
+
+#: LoggingAggregator.php:104
+msgid "This resource requires an HTTP POST."
+msgstr "Denne ressursen krever en HTTP POST."
+
+#: RSSCloudPlugin.php:248
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>."
+msgstr ""
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index f49cef95e..21938ee1d 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -26,8 +26,22 @@
* @link http://status.net/
*/
-// TODO: i18n
-
+/**
+ * This is the UI portion of the Realtime plugin base class, handling
+ * queueing up and displaying of notices that have been received through
+ * other code in one of the subclassed plugin implementations such as
+ * Meteor or Orbited.
+ *
+ * Notices are passed in as JSON objects formatted per the Twitter-compatible
+ * API.
+ *
+ * @todo Currently we duplicate a lot of formatting and layout code from
+ * the PHP side of StatusNet, which makes it very difficult to maintain
+ * this package. Internationalization as well as newer features such
+ * as location data, customized source links for OStatus profiles,
+ * and image thumbnails are not yet supported in Realtime yet because
+ * they have not been implemented here.
+ */
RealtimeUpdate = {
_userid: 0,
_replyurl: '',
@@ -41,6 +55,25 @@ RealtimeUpdate = {
_paused:false,
_queuedNotices:[],
+ /**
+ * Initialize the Realtime plugin UI on a page with a timeline view.
+ *
+ * This function is called from a JS fragment inserted by the PHP side
+ * of the Realtime plugin, and provides us with base information
+ * needed to build a near-replica of StatusNet's NoticeListItem output.
+ *
+ * Once the UI is initialized, a plugin subclass will need to actually
+ * feed data into the RealtimeUpdate object!
+ *
+ * @param {int} userid: local profile ID of the currently logged-in user
+ * @param {String} replyurl: URL for newnotice action, used when generating reply buttons
+ * @param {String} favorurl: URL for favor action, used when generating fave buttons
+ * @param {String} repeaturl: URL for repeat action, used when generating repeat buttons
+ * @param {String} deleteurl: URL template for deletenotice action, used when generating delete buttons.
+ * This URL contains a stub value of 0000000000 which will be replaced with the notice ID.
+ *
+ * @access public
+ */
init: function(userid, replyurl, favorurl, repeaturl, deleteurl)
{
RealtimeUpdate._userid = userid;
@@ -51,23 +84,51 @@ RealtimeUpdate = {
RealtimeUpdate._documenttitle = document.title;
- $(window).bind('focus', function(){ RealtimeUpdate._windowhasfocus = true; });
+ $(window).bind('focus', function() {
+ RealtimeUpdate._windowhasfocus = true;
+
+ // Clear the counter on the window title when we focus in.
+ RealtimeUpdate._updatecounter = 0;
+ RealtimeUpdate.removeWindowCounter();
+ });
$(window).bind('blur', function() {
$('#notices_primary .notice').removeClass('mark-top');
$('#notices_primary .notice:first').addClass('mark-top');
- RealtimeUpdate._updatecounter = 0;
- document.title = RealtimeUpdate._documenttitle;
+ // While we're in the background, received messages will increment
+ // a counter that we put on the window title. This will cause some
+ // browsers to also flash or mark the tab or window title bar until
+ // you seek attention (eg Firefox 4 pinned app tabs).
RealtimeUpdate._windowhasfocus = false;
return false;
});
},
+ /**
+ * Accept a notice in a Twitter-API JSON style and either show it
+ * or queue it up, depending on whether the realtime display is
+ * active.
+ *
+ * The meat of a Realtime plugin subclass is to provide a substrate
+ * transport to receive data and shove it into this function. :)
+ *
+ * Note that the JSON data is extended from the standard API return
+ * with additional fields added by RealtimePlugin's PHP code.
+ *
+ * @param {Object} data: extended JSON API-formatted notice
+ *
+ * @access public
+ */
receive: function(data)
{
+ if (RealtimeUpdate.isNoticeVisible(data.id)) {
+ // Probably posted by the user in this window, and so already
+ // shown by the AJAX form handler. Ignore it.
+ return;
+ }
if (RealtimeUpdate._paused === false) {
RealtimeUpdate.purgeLastNoticeItem();
@@ -82,9 +143,23 @@ RealtimeUpdate = {
RealtimeUpdate.updateWindowCounter();
},
+ /**
+ * Add a visible representation of the given notice at the top of
+ * the current timeline.
+ *
+ * If the notice is already in the timeline, nothing will be added.
+ *
+ * @param {Object} data: extended JSON API-formatted notice
+ *
+ * @fixme while core UI JS code is used to activate the AJAX UI controls,
+ * the actual production of HTML (in makeNoticeItem and its subs)
+ * duplicates core code without plugin hook points or i18n support.
+ *
+ * @access private
+ */
insertNoticeItem: function(data) {
// Don't add it if it already exists
- if ($("#notice-"+data.id).length > 0) {
+ if (RealtimeUpdate.isNoticeVisible(data.id)) {
return;
}
@@ -99,12 +174,41 @@ RealtimeUpdate = {
SN.U.NoticeWithAttachment($('#'+noticeItemID));
},
+ /**
+ * Check if the given notice is visible in the timeline currently.
+ * Used to avoid duplicate processing of notices that have been
+ * displayed by other means.
+ *
+ * @param {number} id: notice ID to check
+ *
+ * @return boolean
+ *
+ * @access private
+ */
+ isNoticeVisible: function(id) {
+ return ($("#notice-"+id).length > 0);
+ },
+
+ /**
+ * Trims a notice off the end of the timeline if we have more than the
+ * maximum number of notices visible.
+ *
+ * @access private
+ */
purgeLastNoticeItem: function() {
if ($('#notices_primary .notice').length > RealtimeUpdate._maxnotices) {
$("#notices_primary .notice:last").remove();
}
},
+ /**
+ * If the window/tab is in background, increment the counter of newly
+ * received notices and append it onto the window title.
+ *
+ * Has no effect if the window is in foreground.
+ *
+ * @access private
+ */
updateWindowCounter: function() {
if (RealtimeUpdate._windowhasfocus === false) {
RealtimeUpdate._updatecounter += 1;
@@ -112,6 +216,30 @@ RealtimeUpdate = {
}
},
+ /**
+ * Clear the background update counter from the window title.
+ *
+ * @access private
+ *
+ * @fixme could interfere with anything else trying similar tricks
+ */
+ removeWindowCounter: function() {
+ document.title = RealtimeUpdate._documenttitle;
+ },
+
+ /**
+ * Builds a notice HTML block from JSON API-style data.
+ *
+ * @param {Object} data: extended JSON API-formatted notice
+ * @return {String} HTML fragment
+ *
+ * @fixme this replicates core StatusNet code, making maintenance harder
+ * @fixme sloppy HTML building (raw concat without escaping)
+ * @fixme no i18n support
+ * @fixme local variables pollute global namespace
+ *
+ * @access private
+ */
makeNoticeItem: function(data)
{
if (data.hasOwnProperty('retweeted_status')) {
@@ -182,6 +310,19 @@ RealtimeUpdate = {
return ni;
},
+ /**
+ * Creates a favorite button.
+ *
+ * @param {number} id: notice ID to work with
+ * @param {String} session_key: session token for form CSRF protection
+ * @return {String} HTML fragment
+ *
+ * @fixme this replicates core StatusNet code, making maintenance harder
+ * @fixme sloppy HTML building (raw concat without escaping)
+ * @fixme no i18n support
+ *
+ * @access private
+ */
makeFavoriteForm: function(id, session_key)
{
var ff;
@@ -197,6 +338,19 @@ RealtimeUpdate = {
return ff;
},
+ /**
+ * Creates a reply button.
+ *
+ * @param {number} id: notice ID to work with
+ * @param {String} nickname: nick of the user to whom we are replying
+ * @return {String} HTML fragment
+ *
+ * @fixme this replicates core StatusNet code, making maintenance harder
+ * @fixme sloppy HTML building (raw concat without escaping)
+ * @fixme no i18n support
+ *
+ * @access private
+ */
makeReplyLink: function(id, nickname)
{
var rl;
@@ -204,6 +358,19 @@ RealtimeUpdate = {
return rl;
},
+ /**
+ * Creates a repeat button.
+ *
+ * @param {number} id: notice ID to work with
+ * @param {String} session_key: session token for form CSRF protection
+ * @return {String} HTML fragment
+ *
+ * @fixme this replicates core StatusNet code, making maintenance harder
+ * @fixme sloppy HTML building (raw concat without escaping)
+ * @fixme no i18n support
+ *
+ * @access private
+ */
makeRepeatForm: function(id, session_key)
{
var rf;
@@ -219,6 +386,18 @@ RealtimeUpdate = {
return rf;
},
+ /**
+ * Creates a delete button.
+ *
+ * @param {number} id: notice ID to create a delete link for
+ * @return {String} HTML fragment
+ *
+ * @fixme this replicates core StatusNet code, making maintenance harder
+ * @fixme sloppy HTML building (raw concat without escaping)
+ * @fixme no i18n support
+ *
+ * @access private
+ */
makeDeleteLink: function(id)
{
var dl, delurl;
@@ -229,6 +408,19 @@ RealtimeUpdate = {
return dl;
},
+ /**
+ * Adds a control widget at the top of the timeline view, containing
+ * pause/play and popup buttons.
+ *
+ * @param {String} url: full URL to the popup window variant of this timeline page
+ * @param {String} timeline: string key for the timeline (eg 'public' or 'evan-all')
+ * @param {String} path: URL to the base directory containing the Realtime plugin,
+ * used to fetch resources if needed.
+ *
+ * @todo timeline and path parameters are unused and probably should be removed.
+ *
+ * @access private
+ */
initActions: function(url, timeline, path)
{
$('#notices_primary').prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');
@@ -239,6 +431,14 @@ RealtimeUpdate = {
RealtimeUpdate.initAddPopup(url, timeline, RealtimeUpdate._pluginPath);
},
+ /**
+ * Initialize the state of the play/pause controls.
+ *
+ * If the browser supports the localStorage interface, we'll attempt
+ * to retrieve a pause state from there; otherwise we default to paused.
+ *
+ * @access private
+ */
initPlayPause: function()
{
if (typeof(localStorage) == 'undefined') {
@@ -254,6 +454,15 @@ RealtimeUpdate = {
}
},
+ /**
+ * Switch the realtime UI into paused state.
+ * Uses SN.msg i18n system for the button label and tooltip.
+ *
+ * State will be saved and re-used next time if the browser supports
+ * the localStorage interface (via setPause).
+ *
+ * @access private
+ */
showPause: function()
{
RealtimeUpdate.setPause(false);
@@ -271,6 +480,15 @@ RealtimeUpdate = {
});
},
+ /**
+ * Switch the realtime UI into play state.
+ * Uses SN.msg i18n system for the button label and tooltip.
+ *
+ * State will be saved and re-used next time if the browser supports
+ * the localStorage interface (via setPause).
+ *
+ * @access private
+ */
showPlay: function()
{
RealtimeUpdate.setPause(true);
@@ -284,6 +502,17 @@ RealtimeUpdate = {
});
},
+ /**
+ * Update the internal pause/play state.
+ * Do not call directly; use showPause() and showPlay().
+ *
+ * State will be saved and re-used next time if the browser supports
+ * the localStorage interface.
+ *
+ * @param {boolean} state: true = paused, false = not paused
+ *
+ * @access private
+ */
setPause: function(state)
{
RealtimeUpdate._paused = state;
@@ -292,6 +521,14 @@ RealtimeUpdate = {
}
},
+ /**
+ * Go through notices we have previously received while paused,
+ * dumping them into the timeline view.
+ *
+ * @fixme long timelines are not trimmed here as they are for things received while not paused
+ *
+ * @access private
+ */
showQueuedNotices: function()
{
$.each(RealtimeUpdate._queuedNotices, function(i, n) {
@@ -303,16 +540,35 @@ RealtimeUpdate = {
RealtimeUpdate.removeQueuedCounter();
},
+ /**
+ * Update the Realtime widget control's counter of queued notices to show
+ * the current count. This will be called after receiving and queueing
+ * a notice while paused.
+ *
+ * @access private
+ */
updateQueuedCounter: function()
{
$('#realtime_playpause #queued_counter').html('('+RealtimeUpdate._queuedNotices.length+')');
},
+ /**
+ * Clear the Realtime widget control's counter of queued notices.
+ *
+ * @access private
+ */
removeQueuedCounter: function()
{
$('#realtime_playpause #queued_counter').empty();
},
+ /**
+ * Set up event handlers on the timeline view to automatically pause
+ * when the mouse is over the timeline, as this indicates the user's
+ * desire to interact with the UI. (Which is hard to do when it's moving!)
+ *
+ * @access private
+ */
addNoticesHover: function()
{
$('#notices_primary .notices').hover(
@@ -329,11 +585,38 @@ RealtimeUpdate = {
);
},
+ /**
+ * Tear down event handlers on the timeline view to automatically pause
+ * when the mouse is over the timeline.
+ *
+ * @fixme this appears to remove *ALL* event handlers from the timeline,
+ * which assumes that nobody else is adding any event handlers.
+ * Sloppy -- we should only remove the ones we add.
+ *
+ * @access private
+ */
removeNoticesHover: function()
{
$('#notices_primary .notices').unbind();
},
+ /**
+ * UI initialization, to be called from Realtime plugin code on regular
+ * timeline pages.
+ *
+ * Adds a button to the control widget at the top of the timeline view,
+ * allowing creation of a popup window with a more compact real-time
+ * view of the current timeline.
+ *
+ * @param {String} url: full URL to the popup window variant of this timeline page
+ * @param {String} timeline: string key for the timeline (eg 'public' or 'evan-all')
+ * @param {String} path: URL to the base directory containing the Realtime plugin,
+ * used to fetch resources if needed.
+ *
+ * @todo timeline and path parameters are unused and probably should be removed.
+ *
+ * @access public
+ */
initAddPopup: function(url, timeline, path)
{
$('#realtime_timeline').append('<button id="realtime_popup"></button>');
@@ -348,6 +631,17 @@ RealtimeUpdate = {
});
},
+ /**
+ * UI initialization, to be called from Realtime plugin code on popup
+ * compact timeline pages.
+ *
+ * Sets up links in notices to open in a new window.
+ *
+ * @fixme fails to do the same for UI links like context view which will
+ * look bad in the tiny chromeless window.
+ *
+ * @access public
+ */
initPopupWindow: function()
{
$('.notices .entry-title a, .notices .entry-content a').bind('click', function() {
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index a06c03c4e..60a4b446e 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._updatecounter=0;document.title=RealtimeUpdate._documenttitle;RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if($("#notice-"+a.id).length>0){return}var b=RealtimeUpdate.makeNoticeItem(a);var c=$(b).attr("id");$("#notices_primary .notices").prepend(b);$("#notices_primary .notice:first").css({display:"none"});$("#notices_primary .notice:first").fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}}; \ No newline at end of file
+RealtimeUpdate={_userid:0,_replyurl:"",_favorurl:"",_repeaturl:"",_deleteurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(c,b,d,e,a){RealtimeUpdate._userid=c;RealtimeUpdate._replyurl=b;RealtimeUpdate._favorurl=d;RealtimeUpdate._repeaturl=e;RealtimeUpdate._deleteurl=a;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}var b=RealtimeUpdate.makeNoticeItem(a);var c=$(b).attr("id");$("#notices_primary .notices").prepend(b);$("#notices_primary .notice:first").css({display:"none"});$("#notices_primary .notice:first").fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(c){if(c.hasOwnProperty("retweeted_status")){original=c.retweeted_status;repeat=c;c=original;unique=repeat.id;responsible=repeat.user}else{original=null;repeat=null;unique=c.id;responsible=c.user}user=c.user;html=c.html.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");source=c.source.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&");ni='<li class="hentry notice" id="notice-'+unique+'"><div class="entry-title"><span class="vcard author"><a href="'+user.profile_url+'" class="url" title="'+user.name+'"><img src="'+user.profile_image_url+'" class="avatar photo" width="48" height="48" alt="'+user.screen_name+'"/><span class="nickname fn">'+user.screen_name+'</span></a></span><p class="entry-content">'+html+'</p></div><div class="entry-content"><a class="timestamp" rel="bookmark" href="'+c.url+'" ><abbr class="published" title="'+c.created_at+'">a few seconds ago</abbr></a> <span class="source">from <span class="device">'+source+"</span></span>";if(c.conversation_url){ni=ni+' <a class="response" href="'+c.conversation_url+'">in context</a>'}if(repeat){ru=repeat.user;ni=ni+'<span class="repeat vcard">Repeated by <a href="'+ru.profile_url+'" class="url"><span class="nickname">'+ru.screen_name+"</span></a></span>"}ni=ni+"</div>";ni=ni+'<div class="notice-options">';if(RealtimeUpdate._userid!=0){var a=$("form#form_notice fieldset input#token");var b=a.val();ni=ni+RealtimeUpdate.makeFavoriteForm(c.id,b);ni=ni+RealtimeUpdate.makeReplyLink(c.id,c.user["screen_name"]);if(RealtimeUpdate._userid==responsible.id){ni=ni+RealtimeUpdate.makeDeleteLink(c.id)}else{if(RealtimeUpdate._userid!=user.id){ni=ni+RealtimeUpdate.makeRepeatForm(c.id,b)}}}ni=ni+"</div>";ni=ni+"</li>";return ni},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}}; \ No newline at end of file
diff --git a/plugins/Recaptcha/locale/ja/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ja/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 000000000..ddb9bf07c
--- /dev/null
+++ b/plugins/Recaptcha/locale/ja/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Recaptcha to Japanese (日本語)
+# Expored from translatewiki.net
+#
+# Author: 青子守歌
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:10+0000\n"
+"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:13:57+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr ""
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr ""
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a "
+"captcha to the registration page."
+msgstr ""
+"登録ページにキャプチャとして<a href=\"http://recaptcha.org/\">Recaptcha</a>"
+"サービスを利用する。"
diff --git a/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 000000000..4d6f78374
--- /dev/null
+++ b/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Recaptcha to Polish (Polski)
+# Expored from translatewiki.net
+#
+# Author: Raven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:10+0000\n"
+"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:13:57+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: RecaptchaPlugin.php:64
+msgid "Captcha"
+msgstr "Captcha"
+
+#: RecaptchaPlugin.php:105
+msgid "Captcha does not match!"
+msgstr ""
+
+#: RecaptchaPlugin.php:117
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a "
+"captcha to the registration page."
+msgstr ""
diff --git a/plugins/RegisterThrottle/locale/ru/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ru/LC_MESSAGES/RegisterThrottle.po
new file mode 100644
index 000000000..ee0758f7d
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/ru/LC_MESSAGES/RegisterThrottle.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - RegisterThrottle to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: MaxSem
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RegisterThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:11+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:44:33+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+msgid "Cannot find IP address."
+msgstr "IP-адрес не найден."
+
+#: RegisterThrottlePlugin.php:149
+msgid "Too many registrations. Take a break and try again later."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:161
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:191
+msgid "Cannot find user after successful registration."
+msgstr ""
+
+#: RegisterThrottlePlugin.php:224
+msgid "Throttles excessive registration from a single IP address."
+msgstr ""
diff --git a/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po
new file mode 100644
index 000000000..71c80757d
--- /dev/null
+++ b/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po
@@ -0,0 +1,69 @@
+# Translation of StatusNet - Sample to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:15+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:46:16+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sample\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:164
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#: User_greeting_count.php:177
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
+
+#: SamplePlugin.php:259 hello.php:111
+msgid "Hello"
+msgstr "Ola"
+
+#: SamplePlugin.php:259
+msgid "A warm greeting"
+msgstr ""
+
+#: SamplePlugin.php:270
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#: hello.php:113
+#, php-format
+msgid "Hello, %s!"
+msgstr ""
+
+#: hello.php:133
+msgid "Hello, stranger!"
+msgstr ""
+
+#: hello.php:136
+#, php-format
+msgid "Hello, %s"
+msgstr "Ola, %s"
+
+#: hello.php:138
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 000000000..497256d09
--- /dev/null
+++ b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - ShareNotice to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:16+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:46:17+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Leave this message unchanged.
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
+#, php-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+#: ShareNoticePlugin.php:130
+msgid "Share on Twitter"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#: ShareNoticePlugin.php:163
+#, php-format
+msgid "Share on %s"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+#: ShareNoticePlugin.php:186
+msgid "Share on Facebook"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: ShareNoticePlugin.php:219
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
diff --git a/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 000000000..3a507508e
--- /dev/null
+++ b/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - ShareNotice to Polish (Polski)
+# Expored from translatewiki.net
+#
+# Author: Raven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:16+0000\n"
+"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:46:17+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Leave this message unchanged.
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
+#, php-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+#: ShareNoticePlugin.php:130
+msgid "Share on Twitter"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#: ShareNoticePlugin.php:163
+#, php-format
+msgid "Share on %s"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+#: ShareNoticePlugin.php:186
+msgid "Share on Facebook"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: ShareNoticePlugin.php:219
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
diff --git a/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 000000000..f70e598f3
--- /dev/null
+++ b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - ShareNotice to Telugu (తెలుగు)
+# Expored from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:16+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-29 19:46:17+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Leave this message unchanged.
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
+#, php-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+#: ShareNoticePlugin.php:130
+msgid "Share on Twitter"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#: ShareNoticePlugin.php:163
+#, php-format
+msgid "Share on %s"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+#: ShareNoticePlugin.php:186
+msgid "Share on Facebook"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: ShareNoticePlugin.php:219
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
diff --git a/plugins/SphinxSearch/locale/br/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/br/LC_MESSAGES/SphinxSearch.po
new file mode 100644
index 000000000..9f89e63e7
--- /dev/null
+++ b/plugins/SphinxSearch/locale/br/LC_MESSAGES/SphinxSearch.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - SphinxSearch to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Fulup
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SphinxSearch\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:28+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:15:02+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Server exception.
+#: SphinxSearchPlugin.php:87
+msgid "Sphinx PHP extension must be installed."
+msgstr "Rekis eo d'an astenn Sphinx PHP bezañ staliet."
+
+#. TRANS: Plugin description.
+#: SphinxSearchPlugin.php:118
+msgid "Plugin for Sphinx search backend."
+msgstr ""
+
+#. TRANS: Server exception thrown when a database name cannot be identified.
+#: sphinxsearch.php:96
+msgid "Sphinx search could not identify database name."
+msgstr ""
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index 61a1b6fb1..d508f35e9 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-04 18:25+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -18,16 +18,16 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:113
+#: twitterimport.php:114
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: twitter.php:349
+#: twitter.php:407
msgid "Your Twitter bridge has been disabled."
msgstr ""
-#: twitter.php:353
+#: twitter.php:411
#, php-format
msgid ""
"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -250,28 +250,24 @@ msgstr ""
msgid "Not a valid invitation code."
msgstr ""
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr ""
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr ""
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr ""
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr ""
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
new file mode 100644
index 000000000..b88c87037
--- /dev/null
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,371 @@
+# Translation of StatusNet - TwitterBridge to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: twitterimport.php:114
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""
+
+#: twitter.php:407
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: twitter.php:411
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
+msgstr ""
+
+#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
+#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
+msgid "Twitter"
+msgstr "Twitter"
+
+#: TwitterBridgePlugin.php:152
+msgid "Login or register using Twitter"
+msgstr ""
+
+#: TwitterBridgePlugin.php:175
+msgid "Twitter integration options"
+msgstr ""
+
+#: TwitterBridgePlugin.php:303
+msgid "Twitter bridge configuration"
+msgstr ""
+
+#: TwitterBridgePlugin.php:327
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+#: twitteradminpanel.php:62
+msgid "Twitter bridge settings"
+msgstr ""
+
+#: twitteradminpanel.php:145
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:151
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:207
+msgid "Twitter application settings"
+msgstr ""
+
+#: twitteradminpanel.php:213
+msgid "Consumer key"
+msgstr ""
+
+#: twitteradminpanel.php:214
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:222
+msgid "Consumer secret"
+msgstr ""
+
+#: twitteradminpanel.php:223
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:233
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+#: twitteradminpanel.php:240
+msgid "Integration source"
+msgstr ""
+
+#: twitteradminpanel.php:241
+msgid "Name of your Twitter application"
+msgstr ""
+
+#: twitteradminpanel.php:253
+msgid "Options"
+msgstr "Dibarzhioù"
+
+#: twitteradminpanel.php:260
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+#: twitteradminpanel.php:262
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+#: twitteradminpanel.php:269
+msgid "Enable Twitter import"
+msgstr ""
+
+#: twitteradminpanel.php:271
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+#: twitteradminpanel.php:288 twittersettings.php:200
+msgid "Save"
+msgstr "Enrollañ"
+
+#: twitteradminpanel.php:288
+msgid "Save Twitter settings"
+msgstr "Enrollañ arventennoù Twitter"
+
+#: twitterlogin.php:56
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
+#: twitterlogin.php:64
+msgid "Twitter Login"
+msgstr ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr ""
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitterauthorization.php:120 twittersettings.php:226
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: twitterauthorization.php:126
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: twitterauthorization.php:135
+msgid "Something weird happened."
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
+#: twitterauthorization.php:300
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#: twitterauthorization.php:312
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#: twitterauthorization.php:318
+msgid "Twitter Account Setup"
+msgstr ""
+
+#: twitterauthorization.php:351
+msgid "Connection options"
+msgstr ""
+
+#: twitterauthorization.php:360
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#: twitterauthorization.php:381
+msgid "Create new account"
+msgstr "Krouiñ ur gont nevez"
+
+#: twitterauthorization.php:383
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: twitterauthorization.php:386
+msgid "New nickname"
+msgstr "Lesanv nevez"
+
+#: twitterauthorization.php:388
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: twitterauthorization.php:391
+msgid "Create"
+msgstr "Krouiñ"
+
+#: twitterauthorization.php:396
+msgid "Connect existing account"
+msgstr ""
+
+#: twitterauthorization.php:398
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:401
+msgid "Existing nickname"
+msgstr ""
+
+#: twitterauthorization.php:404
+msgid "Password"
+msgstr "Ger-tremen"
+
+#: twitterauthorization.php:407
+msgid "Connect"
+msgstr "Kevreañ"
+
+#: twitterauthorization.php:423 twitterauthorization.php:432
+msgid "Registration not allowed."
+msgstr ""
+
+#: twitterauthorization.php:439
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: twitterauthorization.php:452
+msgid "Nickname not allowed."
+msgstr ""
+
+#: twitterauthorization.php:457
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: twitterauthorization.php:472
+msgid "Error registering user."
+msgstr ""
+
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: twitterauthorization.php:503
+msgid "Invalid username or password."
+msgstr ""
+
+#: twittersettings.php:58
+msgid "Twitter settings"
+msgstr "Arventennoù Twitter"
+
+#: twittersettings.php:69
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#: twittersettings.php:116
+msgid "Twitter account"
+msgstr "Kont Twitter"
+
+#: twittersettings.php:121
+msgid "Connected Twitter account"
+msgstr ""
+
+#: twittersettings.php:126
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:132
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:136
+msgid "set a password"
+msgstr "Termeniñ ur ger-tremen"
+
+#: twittersettings.php:138
+msgid " first."
+msgstr "da gentañ."
+
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:142
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#: twittersettings.php:150
+msgid "Disconnect"
+msgstr "Digevreet"
+
+#: twittersettings.php:157
+msgid "Preferences"
+msgstr "Penndibaboù"
+
+#: twittersettings.php:161
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: twittersettings.php:168
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: twittersettings.php:175
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: twittersettings.php:184
+msgid "Import my friends timeline."
+msgstr ""
+
+#: twittersettings.php:202
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+#: twittersettings.php:236
+msgid "Unexpected form submission."
+msgstr ""
+
+#: twittersettings.php:251
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#: twittersettings.php:259
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: twittersettings.php:263
+msgid "Twitter account disconnected."
+msgstr ""
+
+#: twittersettings.php:283 twittersettings.php:294
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: twittersettings.php:302
+msgid "Twitter preferences saved."
+msgstr ""
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index bf29226c1..52d44caeb 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:58:27+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fa\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -255,29 +255,24 @@ msgstr "اجازهٔ ثبت‌نام داده نشده است."
msgid "Not a valid invitation code."
msgstr "کد دعوت نامعتبر است."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"نام مستعار باید فقط به صورت حروف کوچک انگلیسی، اعداد و بدون فاصله باشد."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "نام مستعار مجاز نیست."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "خطا در ثبت نام کاربر."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "خطا در اتصال کاربر به توییتر."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "نام کاربری یا رمز عبور اشتباه است."
@@ -374,3 +369,7 @@ msgstr "نمی‌توان ترجیحات توییتر را ذخیره کرد."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "تنظیمات توییتر ذخیره شد."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "نام مستعار باید فقط به صورت حروف کوچک انگلیسی، اعداد و بدون فاصله باشد."
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 086440eb6..e0a05063d 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -287,30 +287,24 @@ msgstr "Inscription non autorisée."
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
-"chiffres, sans espaces."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Erreur lors de l’inscription de l’utilisateur."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Erreur de connexion de l’utilisateur à Twitter."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
@@ -413,3 +407,8 @@ msgstr "Impossible de sauvegarder les préférences Twitter."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "Préférences Twitter enregistrées."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
+#~ "chiffres, sans espaces."
diff --git a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
new file mode 100644
index 000000000..bfb0b2a2b
--- /dev/null
+++ b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,371 @@
+# Translation of StatusNet - TwitterBridge to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
+"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: twitterimport.php:114
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""
+
+#: twitter.php:407
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: twitter.php:411
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
+msgstr ""
+
+#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
+#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
+msgid "Twitter"
+msgstr "Twitter"
+
+#: TwitterBridgePlugin.php:152
+msgid "Login or register using Twitter"
+msgstr ""
+
+#: TwitterBridgePlugin.php:175
+msgid "Twitter integration options"
+msgstr ""
+
+#: TwitterBridgePlugin.php:303
+msgid "Twitter bridge configuration"
+msgstr ""
+
+#: TwitterBridgePlugin.php:327
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+#: twitteradminpanel.php:62
+msgid "Twitter bridge settings"
+msgstr ""
+
+#: twitteradminpanel.php:145
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:151
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:207
+msgid "Twitter application settings"
+msgstr ""
+
+#: twitteradminpanel.php:213
+msgid "Consumer key"
+msgstr "Clave do consumidor"
+
+#: twitteradminpanel.php:214
+msgid "Consumer key assigned by Twitter"
+msgstr "Clave do consumidor asignada polo Twitter"
+
+#: twitteradminpanel.php:222
+msgid "Consumer secret"
+msgstr "Pregunta secreta do consumidor"
+
+#: twitteradminpanel.php:223
+msgid "Consumer secret assigned by Twitter"
+msgstr "Pregunta secreta do consumidor asignada polo Twitter"
+
+#: twitteradminpanel.php:233
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+#: twitteradminpanel.php:240
+msgid "Integration source"
+msgstr "Fonte de integración"
+
+#: twitteradminpanel.php:241
+msgid "Name of your Twitter application"
+msgstr ""
+
+#: twitteradminpanel.php:253
+msgid "Options"
+msgstr "Opcións"
+
+#: twitteradminpanel.php:260
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+#: twitteradminpanel.php:262
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+#: twitteradminpanel.php:269
+msgid "Enable Twitter import"
+msgstr ""
+
+#: twitteradminpanel.php:271
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+#: twitteradminpanel.php:288 twittersettings.php:200
+msgid "Save"
+msgstr "Gardar"
+
+#: twitteradminpanel.php:288
+msgid "Save Twitter settings"
+msgstr ""
+
+#: twitterlogin.php:56
+msgid "Already logged in."
+msgstr ""
+
+#: twitterlogin.php:64
+msgid "Twitter Login"
+msgstr ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr ""
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitterauthorization.php:120 twittersettings.php:226
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: twitterauthorization.php:126
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: twitterauthorization.php:135
+msgid "Something weird happened."
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
+#: twitterauthorization.php:300
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#: twitterauthorization.php:312
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#: twitterauthorization.php:318
+msgid "Twitter Account Setup"
+msgstr ""
+
+#: twitterauthorization.php:351
+msgid "Connection options"
+msgstr ""
+
+#: twitterauthorization.php:360
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#: twitterauthorization.php:381
+msgid "Create new account"
+msgstr ""
+
+#: twitterauthorization.php:383
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: twitterauthorization.php:386
+msgid "New nickname"
+msgstr ""
+
+#: twitterauthorization.php:388
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: twitterauthorization.php:391
+msgid "Create"
+msgstr "Crear"
+
+#: twitterauthorization.php:396
+msgid "Connect existing account"
+msgstr ""
+
+#: twitterauthorization.php:398
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:401
+msgid "Existing nickname"
+msgstr ""
+
+#: twitterauthorization.php:404
+msgid "Password"
+msgstr "Contrasinal"
+
+#: twitterauthorization.php:407
+msgid "Connect"
+msgstr "Conectar"
+
+#: twitterauthorization.php:423 twitterauthorization.php:432
+msgid "Registration not allowed."
+msgstr ""
+
+#: twitterauthorization.php:439
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: twitterauthorization.php:452
+msgid "Nickname not allowed."
+msgstr ""
+
+#: twitterauthorization.php:457
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: twitterauthorization.php:472
+msgid "Error registering user."
+msgstr ""
+
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: twitterauthorization.php:503
+msgid "Invalid username or password."
+msgstr ""
+
+#: twittersettings.php:58
+msgid "Twitter settings"
+msgstr "Configuración do Twitter"
+
+#: twittersettings.php:69
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#: twittersettings.php:116
+msgid "Twitter account"
+msgstr "Conta do Twitter"
+
+#: twittersettings.php:121
+msgid "Connected Twitter account"
+msgstr ""
+
+#: twittersettings.php:126
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:132
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:136
+msgid "set a password"
+msgstr ""
+
+#: twittersettings.php:138
+msgid " first."
+msgstr " primeiro."
+
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:142
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#: twittersettings.php:150
+msgid "Disconnect"
+msgstr "Desconectarse"
+
+#: twittersettings.php:157
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: twittersettings.php:161
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: twittersettings.php:168
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: twittersettings.php:175
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: twittersettings.php:184
+msgid "Import my friends timeline."
+msgstr ""
+
+#: twittersettings.php:202
+msgid "Add"
+msgstr "Engadir"
+
+#: twittersettings.php:236
+msgid "Unexpected form submission."
+msgstr ""
+
+#: twittersettings.php:251
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#: twittersettings.php:259
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: twittersettings.php:263
+msgid "Twitter account disconnected."
+msgstr ""
+
+#: twittersettings.php:283 twittersettings.php:294
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: twittersettings.php:302
+msgid "Twitter preferences saved."
+msgstr ""
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 34bb75c01..846d54442 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -278,28 +278,24 @@ msgstr "Creation de conto non permittite."
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Error durante le registration del usator."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Error durante le connexion del usator a Twitter."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
@@ -402,3 +398,7 @@ msgstr "Non poteva salveguardar le preferentias de Twitter."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "Preferentias de Twitter salveguardate."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index b5c8b2be1..dd81ef8c1 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -280,29 +280,24 @@ msgstr "Регистрацијата не е дозволена."
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Прекарот мора да се состои само од мали букви и бројки, без празни места."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Грешка при регистрирање на корисникот."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Грешка при поврзувањето на корисникот со Twitter."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
@@ -405,3 +400,7 @@ msgstr "Не можев да ги зачувам нагодувањата за T
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "Нагодувањата за Twitter се зачувани."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Прекарот мора да се состои само од мали букви и бројки, без празни места."
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index db83f990f..00ab91a30 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 16:54+0000\n"
-"PO-Revision-Date: 2010-11-30 16:58:28+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77474); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -285,31 +285,25 @@ msgstr "Registratie is niet toegestaan."
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
-"zijn niet toegestaan."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Fout bij het registreren van de gebruiker."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Fout bij het verbinden van de gebruiker met Twitter."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
@@ -412,3 +406,8 @@ msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "De Twitterinstellingen zijn opgeslagen."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+#~ "zijn niet toegestaan."
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index ef5f87337..9e84e8fc6 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -264,30 +264,24 @@ msgstr "Kayıt yapılmasına izin verilmiyor."
msgid "Not a valid invitation code."
msgstr "Geçerli bir davet kodu değil."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Kullanıcı adı sadece küçük harfler ve rakamlardan oluşabilir, boşluk "
-"kullanılamaz."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Bu kullanıcı adına izin verilmiyor."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Kullanıcı kayıt hatası."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Twitter'a kullanıcı bağlama hatası."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Geçersiz kullanıcı adı veya parola."
@@ -386,3 +380,8 @@ msgstr "Twitter tercihleri kaydedilemedi."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "Twitter tercihleriniz kaydedildi."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Kullanıcı adı sadece küçük harfler ve rakamlardan oluşabilir, boşluk "
+#~ "kullanılamaz."
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 0c9a2033c..03d4cab58 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:40+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -282,30 +282,24 @@ msgstr "Реєстрацію не дозволено."
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "Помилка при реєстрації користувача."
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "Помилка при підключенні користувача до Twitter."
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "Недійсне ім’я або пароль."
@@ -408,3 +402,8 @@ msgstr "Не можу зберегти налаштування Twitter."
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "Налаштування Twitter збережено."
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, "
+#~ "ніяких інтервалів."
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 3d6745e4e..2e311d4bf 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - TwitterBridge\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-29 15:37+0000\n"
-"PO-Revision-Date: 2010-11-29 15:42:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:20:41+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-05 00:29:29+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77421); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:30+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -271,28 +271,24 @@ msgstr "不允许注册。"
msgid "Not a valid invitation code."
msgstr "无效的邀请码。"
-#: twitterauthorization.php:449
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-
-#: twitterauthorization.php:454
+#: twitterauthorization.php:452
msgid "Nickname not allowed."
msgstr "昵称不被允许。"
-#: twitterauthorization.php:459
+#: twitterauthorization.php:457
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: twitterauthorization.php:474
+#: twitterauthorization.php:472
msgid "Error registering user."
msgstr "注册用户出错。"
-#: twitterauthorization.php:485 twitterauthorization.php:523
-#: twitterauthorization.php:543
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
msgid "Error connecting user to Twitter."
msgstr "关联用户到 Twitter 出错。"
-#: twitterauthorization.php:505
+#: twitterauthorization.php:503
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
@@ -390,3 +386,6 @@ msgstr "无法保存 Twitter 参数设置。"
#: twittersettings.php:302
msgid "Twitter preferences saved."
msgstr "已保存 Twitter 参数设置。"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr "昵称只能使用小写字母和数字且不能使用空格。"
diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php
index d05a2c6b3..1a83b47d5 100644
--- a/plugins/TwitterBridge/twitteradminpanel.php
+++ b/plugins/TwitterBridge/twitteradminpanel.php
@@ -133,6 +133,11 @@ class TwitteradminpanelAction extends AdminPanelAction
$config->query('COMMIT');
+ // Flush the router cache: we may have enabled/disabled bridging,
+ // which will add or remove some actions.
+ $cache = Cache::instance();
+ $cache->delete(Router::cacheKey());
+
return;
}