summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-10-19 12:08:48 -0700
committerZach Copley <zach@status.net>2010-10-19 12:08:48 -0700
commit5ac694c74f1f37f8742d34efbff5e8a763090c9e (patch)
tree42c8df35d0ebc3162d39c591dd1cfe21e2b1edb9 /locale
parent5866493cae0f2877398e5bedfb4261dfefbdf7dd (diff)
parentfd55eef79545613b58d407c55a6e04baed1a8a6a (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'locale')
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po580
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po585
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po585
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po578
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po663
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po641
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po642
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po623
-rw-r--r--locale/eo/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po585
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po582
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po592
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po583
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po603
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po585
-rw-r--r--locale/hu/LC_MESSAGES/statusnet.po581
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po589
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po575
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po591
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po589
-rw-r--r--locale/ka/LC_MESSAGES/statusnet.po584
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po653
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po592
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po588
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po585
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po576
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po603
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po593
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/statusnet.pot547
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po587
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po584
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po637
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po589
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po585
38 files changed, 13588 insertions, 9002 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index db753499f..36b314463 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:15+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:30+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -90,14 +90,15 @@ msgstr "Stoor"
msgid "No such page."
msgstr "Hierdie bladsy bestaan nie."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -193,12 +194,13 @@ msgstr "U en vriende"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Opdaterings van %1$s en vriende op %2$s."
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -225,7 +227,7 @@ msgstr "Die API-funksie is nie gevind nie."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -297,45 +299,60 @@ msgstr "Die blokkering van die gebruiker het gefaal."
msgid "Unblock user failed."
msgstr "Die deblokkering van die gebruiker het gefaal."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direkte boodskappe vanaf %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle direkte boodskappe deur %s gestuur"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direkte boodskappe aan %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle direkte boodskappe gestuur aan %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Die boodskap bevat geen inhoud nie!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+msgstr[1] "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Die ontvanger kon gevind word nie."
-#: 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 ""
"U kan nie direkte boodskappe aan gebruikers wat nie op u viendelys is stuur "
"nie."
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -523,15 +540,21 @@ msgstr "groepe op %s"
msgid "Upload failed."
msgstr "Die deblokkering van die gebruiker het gefaal."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ongeldige token."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Ongeldige token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -549,35 +572,23 @@ msgstr "Ongeldige token."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Ongeldige gebruikersnaam of wagwoord!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Moenie die applikasie verwyder nie"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -586,15 +597,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Die vorm is onverwags ingestuur."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "'n Toepassing vra toegang tot u gebruikersinligting"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Toegang toelaat of weier"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -603,11 +614,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -616,23 +627,47 @@ msgid "Nickname"
msgstr "Bynaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Wagwoord"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Ontsê"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Kanselleer"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Toestaan"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Laat toegang tot u gebruikersinligting toe of weier dit."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Geen bevestigingskode."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, php-format
+msgid "You have successfully authorized %s."
+msgstr ""
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Hierdie metode vereis 'n POST of DELETE."
@@ -795,7 +830,8 @@ msgid "Preview"
msgstr "Voorskou"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Skrap"
@@ -848,12 +884,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nee"
@@ -866,12 +903,13 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -886,9 +924,12 @@ msgstr "Blokkeer hierdie gebruiker"
msgid "Failed to save block information."
msgstr ""
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1018,7 +1059,7 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1043,6 +1084,64 @@ msgstr "Moenie die applikasie verwyder nie"
msgid "Delete this application"
msgstr "Skrap hierdie applikasie"
+#. 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 "U moet aanteken alvorens u 'n groep kan verlaat."
+
+#. 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 "Geen gebruikersnaam of ID nie."
+
+#. 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 "U is nie 'n lid van die groep nie."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Dit was nie moontlik om die groep by te werk nie."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s het die groep %2$s verlaat"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Verwyder gebruiker"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Moenie hierdie kennisgewing verwyder nie"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Verwyder die gebruiker"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1115,54 +1214,64 @@ msgstr "Ontwerp"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Die logo-URL is ongeldig."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Die logo-URL is ongeldig."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "IM is nie beskikbaar nie."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Verander logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Webwerf-logo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Webwerf-logo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Verander tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Werf se tema"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema vir die werf."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Werf se tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Verander die agtergrond-prent"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Agtergrond"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1170,69 +1279,69 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Af"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
#, fuzzy
msgid "Turn background image on or off."
msgstr "Verander die agtergrond-prent"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Verander die agtergrond-prent"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Verander kleure"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Kantstrook"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Skakels"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Gevorderd"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Gebruik verstekwaardes"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
#, fuzzy
msgid "Restore default designs"
msgstr "Gebruik verstekwaardes"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Stel terug na standaard"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1242,7 +1351,7 @@ msgstr "Stel terug na standaard"
msgid "Save"
msgstr "Stoor"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Stoor ontwerp"
@@ -1714,7 +1823,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Kon nie die profiel stoor nie."
@@ -2267,10 +2376,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "U moet aanteken alvorens u by groep kan aansluit."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Geen gebruikersnaam of ID nie."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2513,6 +2618,11 @@ msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
msgid "No content!"
msgstr "Geen inhoud nie!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dit is te lank. Die maksimum boodskaplengte is %d karakters."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Geen ontvanger gespesifiseer nie."
@@ -2671,7 +2781,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
#, fuzzy
msgid "Not a supported data format."
msgstr "Nie-ondersteunde formaat."
@@ -2828,148 +2938,166 @@ msgstr "Paaie"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Webtuiste"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Bediener"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Pad"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
#, fuzzy
msgid "Site path"
msgstr "Werf se tema"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Tema-bediener"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema vir die werf."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Tema-pad"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-bediener"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Werf se tema"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Tema-gids"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar-bediener"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avatar-pad"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatar-gids"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Agtergronde"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Agtergrond-bediener"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Agtergrond-pad"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Agtergrond-gids"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Aanhangsels"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nooit"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Soms"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Altyd"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Gebruik SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Wanneer SSL gebruik moet word"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-bediener"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Tema-pad"
@@ -3723,7 +3851,7 @@ msgstr "Organisasie"
msgid "Description"
msgstr "Beskrywing"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistieke"
@@ -3861,45 +3989,45 @@ msgstr "Aliasse"
msgid "Group actions"
msgstr "Groepsaksies"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Voer vir vriende van %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Voer vir vriende van %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Voer vir vriende van %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Vriend van 'n vriend vir die groep %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Lede"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(geen)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alle lede"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Geskep"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3909,7 +4037,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3918,7 +4046,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administrateurs"
@@ -4853,7 +4981,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Weergawe"
@@ -5092,7 +5220,7 @@ msgid "Unable to save tag."
msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
#. 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 ""
@@ -5223,191 +5351,191 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlik"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Verander u wagwoord"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Konnekteer"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, 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:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodig"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Meld by die webwerf aan"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Teken uit"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skep 'n gebruiker"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registreer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Meld by die webwerf aan"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Teken in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help my!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Soek na mense of teks"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Soek"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
#, fuzzy
msgid "Site notice"
msgstr "Verwyder kennisgewing"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
#, fuzzy
msgid "Local views"
msgstr "Lokaal"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
#, fuzzy
msgid "Page notice"
msgstr "Populêre kennisgewings"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Aangaande"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Gewilde vrae"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Gebruiksvoorwaardes"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privaatheid"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Bron"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontak"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "Aanpor"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr ""
@@ -5415,7 +5543,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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5423,7 +5551,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5432,7 +5560,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5441,51 +5569,51 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
#, fuzzy
msgid "Pagination"
msgstr "Registratie"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Na"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Voor"
@@ -5636,12 +5764,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5730,11 +5858,6 @@ msgstr "Lees-skryf"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Kanselleer"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
#, fuzzy
@@ -5763,11 +5886,6 @@ msgstr "Verwyder"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Aanhangsels"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6198,14 +6316,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Konnekteer"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6909,24 +7027,24 @@ msgstr "Aanpor"
msgid "Send a nudge to this user"
msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
-#: lib/oauthstore.php:283
+#: 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
#, fuzzy
msgid "Couldn't insert new subscription."
msgstr "Kon nie e-posbevestiging verwyder nie."
@@ -7295,17 +7413,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7313,12 +7431,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7326,12 +7444,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7339,12 +7457,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7352,7 +7470,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 b71f146aa..1d3660e61 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:16+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:31+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -94,14 +94,15 @@ msgstr "احفظ"
msgid "No such page."
msgstr "لا صفحة كهذه."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -197,12 +198,13 @@ msgstr "أنت والأصدقاء"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "الإشعارات التي فضلها %1$s في %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -229,7 +231,7 @@ msgstr "لم يتم العثور على وسيلة API."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -302,43 +304,62 @@ msgstr "فشل منع المستخدم."
msgid "Unblock user failed."
msgstr "فشل إلغاء منع المستخدم."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "رسائل مباشرة من %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "جميع الرسائل المرسلة من %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "رسالة مباشرة %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "كل الرسائل المباشرة التي أرسلت إلى %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "لا نص في الرسالة!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127
#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
-
+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[2] "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
+msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
+msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
+msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "لم يُعثر على المستخدم المستلم."
-#: 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 ""
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
#, fuzzy
@@ -526,16 +547,21 @@ msgstr "مجموعات %s"
msgid "Upload failed."
msgstr "ارفع ملفًا"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "توكن دخول غير صحيح محدد."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "حجم غير صالح."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -553,34 +579,22 @@ msgstr "حجم غير صالح."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "اسم/كلمة سر غير صحيحة!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -589,15 +603,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr ""
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "اسمح أو امنع الوصول"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -606,11 +620,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -619,21 +633,44 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمة السر"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "ارفض"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "ألغِ"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "اسمح"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "أُلغي تأكيد المراسلة الفورية."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "لا تملك تصريحًا."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -799,7 +836,8 @@ msgid "Preview"
msgstr "معاينة"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "احذف"
@@ -853,12 +891,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "لا"
@@ -871,12 +910,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
@@ -891,9 +931,12 @@ msgstr "امنع هذا المستخدم"
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1021,7 +1064,7 @@ msgstr "أنت لست مالك هذا التطبيق."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1046,6 +1089,65 @@ msgstr "لا تحذف هذا التطبيق"
msgid "Delete this application"
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 "يجب أن تلج لتغادر مجموعة."
+
+#. 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 "لا اسم مستعار."
+
+#. 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 "لست عضوًا في هذه المجموعة"
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ترك المجموعة %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "احذف المستخدم"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "لا تحذف هذا الإشعار"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "احذف هذا المستخدم"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1118,53 +1220,63 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "مسار شعار غير صالح."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "السمة غير متوفرة: %s"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "شعار الموقع"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "سمة الموقع"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "سمة الموقع."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "سمة مخصصة"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صورة الخلفية"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1172,67 +1284,67 @@ msgid ""
msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلفية أو عطّلها."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "تغيير صورة الخلفية"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "متقدم"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS مخصصة"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1242,7 +1354,7 @@ msgstr "ارجع إلى المبدئي"
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -1712,7 +1824,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "خطأ أثناء تحديث الملف الشخصي البعيد."
@@ -2262,11 +2374,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "يجب أن تلج لتنضم إلى مجموعة."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "لا اسم مستعار."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2508,6 +2615,11 @@ msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
msgid "No content!"
msgstr "لا محتوى!"
+#: actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d حرفًا."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
@@ -2663,7 +2775,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -2812,148 +2924,167 @@ msgstr "المسارات"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "لا يمكن قراءة دليل السمات: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "لا يمكن الكتابة في دليل الأفتارات: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "لا يمكن الكتابة في دليل الخلفيات: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "لا يمكن قراءة دليل المحليات: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
#, fuzzy
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "الموقع"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "خادوم"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "اسم مضيف خادوم الموقع."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "المسار"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "مسار الموقع"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "مسار المحليات"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "مسار دليل المحليات"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "مسارات فاخرة"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "أأستخدم مسارات فاخرة (يمكن قراءتها وتذكرها بسهولة أكبر)؟"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "السمة"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "خادوم السمات"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "سمة الموقع."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "مسار السمات"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "خادم SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "مسار الموقع"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "مسار دليل المحليات"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "أفتارات"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "خادوم الأفتارات"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "مسار الأفتارات"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "دليل الأفتار."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "خلفيات"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "خادوم الخلفيات"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "مسار الخلفيات"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "دليل الخلفيات"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "مرفقات"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "مطلقا"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "أحيانًا"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "دائمًا"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "استخدم SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "خادم SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "احفظ المسارات"
@@ -3682,7 +3813,7 @@ msgstr "المنظمة"
msgid "Description"
msgstr "الوصف"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "إحصاءات"
@@ -3822,45 +3953,45 @@ msgstr "الكنى"
msgid "Group actions"
msgstr "تصرفات المستخدم"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "مجموعة %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "الأعضاء"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "أنشئت"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3875,7 +4006,7 @@ msgstr ""
"[انضم الآن](%%%%action.register%%%%) لتصبح عضوًا في هذه المجموعة ومجموعات "
"أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3887,7 +4018,7 @@ msgstr ""
"en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]"
"(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "الإداريون"
@@ -4806,7 +4937,7 @@ msgid "Plugins"
msgstr "الملحقات"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "النسخة"
@@ -5040,7 +5171,7 @@ msgid "Unable to save tag."
msgstr "تعذّر حفظ إشعار الموقع."
#. 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 ""
@@ -5160,187 +5291,187 @@ msgid "Untitled page"
msgstr "صفحة غير مُعنونة"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "الصفحة الشخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "ادعُ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "اخرج من الموقع"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "اخرج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ حسابًا"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "لُج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نصوص"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "إشعار الصفحة"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "الأسئلة المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "اتصل"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "الجسر"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "رخصة برنامج StatusNet"
@@ -5348,7 +5479,7 @@ msgstr "رخصة برنامج StatusNet"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5358,7 +5489,7 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5367,7 +5498,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5379,51 +5510,51 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
#, fuzzy
msgid "Pagination"
msgstr "تسجيل"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "قبل"
@@ -5566,12 +5697,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5660,11 +5791,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "ألغِ"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5691,11 +5817,6 @@ msgstr "أزل"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "مرفقات"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6173,14 +6294,14 @@ msgstr "رسائل قصيرة"
msgid "Updates by SMS"
msgstr "تحديثات عبر الرسائل القصيرة"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "اتصالات"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6897,24 +7018,24 @@ msgstr "نبّه"
msgid "Send a nudge to this user"
msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-#: lib/oauthstore.php:283
+#: 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 "تعذّر إدراج اشتراك جديد."
@@ -7267,17 +7388,17 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7289,12 +7410,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7306,12 +7427,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7323,12 +7444,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7340,7 +7461,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 81d2bd532..a7124c520 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:18+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:31+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -98,14 +98,15 @@ msgstr "أرسل"
msgid "No such page."
msgstr "لا وسم كهذا."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "أنت والأصدقاء"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%1$s و الصحاب, صفحه %2$d"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "الـ API method مش موجوده."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -306,43 +308,62 @@ msgstr "فشل منع المستخدم."
msgid "Unblock user failed."
msgstr "فشل إلغاء منع المستخدم."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "رسائل مباشره من %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, fuzzy, php-format
msgid "All the direct messages sent from %s"
msgstr "رسائل مباشره من %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "رساله مباشره %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, fuzzy, php-format
msgid "All the direct messages sent to %s"
msgstr "رساله مباشره %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "لا نص فى الرسالة!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127
#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-
+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[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "لم يُعثر على المستخدم المستلم."
-#: 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 ""
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
#, fuzzy
@@ -531,16 +552,21 @@ msgstr "مجموعات %s"
msgid "Upload failed."
msgstr "ارفع ملفًا"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "حجم غير صالح."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -558,36 +584,24 @@ msgstr "حجم غير صالح."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "نيكنيم / پاسوورد مش مظبوطه!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "خطأ قاعده البيانات أثناء حذف المستخدم OAuth app"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -596,15 +610,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr ""
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -613,11 +627,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "الحساب"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -626,21 +640,44 @@ msgid "Nickname"
msgstr "الاسم المستعار"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "كلمه السر"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "ارفض"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "ألغِ"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "اسمح"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "لا رمز تأكيد."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "لا تملك تصريحًا."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -807,7 +844,8 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "احذف"
@@ -862,12 +900,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "ملاحظة"
@@ -880,12 +919,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -901,9 +941,12 @@ msgstr "امنع هذا المستخدم"
msgid "Failed to save block information."
msgstr "فشل حفظ معلومات المنع."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1032,7 +1075,7 @@ msgstr "انت مش بتملك الapplication دى."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1059,6 +1102,65 @@ msgstr "لا تحذف هذا الإشعار"
msgid "Delete this application"
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 "يجب أن تكون والجًا لتنشئ مجموعه."
+
+#. 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 "لا اسم مستعار."
+
+#. 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 "لست عضوا فى تلك المجموعه."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ساب جروپ %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "احذف المستخدم"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "لا تحذف هذا الإشعار"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "احذف هذا المستخدم"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1131,54 +1233,64 @@ msgstr "التصميم"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "مسار شعار غير صالح."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "المراسله الفوريه غير متوفره."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "شعار الموقع"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "سمه الموقع"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "سمه الموقع."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "سمه الموقع"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صوره الخلفية"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1186,67 +1298,67 @@ msgid ""
msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صوره الخلفيه أو عطّلها."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "تغيير صوره الخلفية"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1256,7 +1368,7 @@ msgstr "ارجع إلى المبدئي"
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -1737,7 +1849,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "خطأ أثناء تحديث الملف الشخصى البعيد"
@@ -2290,11 +2402,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "يجب أن تلج لتُعدّل المجموعات."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "لا اسم مستعار."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2537,6 +2644,11 @@ msgstr "أرسل رساله مباشره إلى هذا المستخدم"
msgid "No content!"
msgstr "لا محتوى!"
+#: actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "لا مستلم حُدّد."
@@ -2690,7 +2802,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -2840,148 +2952,167 @@ msgstr "المسارات"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "دليل الأفتار."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "دليل الخلفيات"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "لا يمكن قراءه دليل المحليات: %s"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
#, fuzzy
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "الموقع"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "خادوم"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "اسم مضيف خادوم الموقع."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "المسار"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "مسار الموقع"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "مسار المحليات"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "مسار دليل المحليات"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "مسارات فاخرة"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "السمة"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "خادوم السمات"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "سمه الموقع."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL server"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "مسار السمات"
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "مسار الموقع"
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "دليل السمات"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "مسار دليل المحليات"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "أفتارات"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "خادوم الأفتارات"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "مسار الأفتارات"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "دليل الأفتار."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "خلفيات"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "خادوم الخلفيات"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "مسار الخلفيات"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "دليل الخلفيات"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "مرفقات"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "مطلقا"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "أحيانًا"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "دائمًا"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "استخدم SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "احفظ المسارات"
@@ -3709,7 +3840,7 @@ msgstr "المنظمه"
msgid "Description"
msgstr "الوصف"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "إحصاءات"
@@ -3851,45 +3982,45 @@ msgstr "الكنى"
msgid "Group actions"
msgstr "تصرفات المستخدم"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "مجموعه %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "الأعضاء"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "أنشئ"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3903,7 +4034,7 @@ msgstr ""
"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
"([اقرأ المزيد](%%doc.help%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3914,7 +4045,7 @@ msgstr ""
"هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
"blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "الإداريون"
@@ -4842,7 +4973,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "النسخه"
@@ -5076,7 +5207,7 @@ msgid "Unable to save tag."
msgstr "تعذّر حفظ الوسوم."
#. 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 ""
@@ -5197,130 +5328,130 @@ msgid "Untitled page"
msgstr "صفحه غير مُعنونة"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
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:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "شخصية"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "غير كلمه سرّك"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "كونيكشونات (Connections)"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "اتصل"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "إداري"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, 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:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "ادعُ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "سمه الموقع."
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "الشعار"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "أنشئ مجموعه جديدة"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "سجّل"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "لُج"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "مساعدة"
-#: lib/action.php:509
+#: lib/action.php:537
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "مساعدة"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5328,69 +5459,69 @@ msgstr "ابحث"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "إشعار الموقع"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "المشاهدات المحلية"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "إشعار الصفحة"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "ضبط الموقع الأساسي"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "مساعدة"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "عن"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "الأسئله المكررة"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "الشروط"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "خصوصية"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "المصدر"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "اتصل"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "نبّه"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
#, fuzzy
msgid "StatusNet software license"
msgstr "رخصه محتوى الموقع"
@@ -5399,7 +5530,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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5409,7 +5540,7 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5418,7 +5549,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5430,51 +5561,51 @@ msgstr ""
"agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
#, fuzzy
msgid "Pagination"
msgstr "المنظمه"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "قبل"
@@ -5623,12 +5754,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5719,11 +5850,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "ألغِ"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5750,11 +5876,6 @@ msgstr "استرجع"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "مرفقات"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6197,14 +6318,14 @@ msgstr "رسائل قصيرة"
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "كونيكشونات (Connections)"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6900,24 +7021,24 @@ msgstr "نبّه"
msgid "Send a nudge to this user"
msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-#: lib/oauthstore.php:283
+#: 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 "تعذّر إدراج اشتراك جديد."
@@ -7273,17 +7394,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7295,12 +7416,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7312,12 +7433,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7329,12 +7450,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7346,7 +7467,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 6c26ec4e7..6a7c09980 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:19+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:32+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -91,14 +91,15 @@ msgstr "Запазване"
msgid "No such page."
msgstr "Няма такака страница."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -192,12 +193,13 @@ msgstr "Вие и приятелите"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Бележки от %1$s и приятели в %2$s."
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -224,7 +226,7 @@ msgstr "Не е открит методът в API."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -298,45 +300,63 @@ msgstr "Грешка при блокиране на потребителя."
msgid "Unblock user failed."
msgstr "Грешка при разблокиране на потребителя."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Преки съобщения от %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Всички преки съобщения, изпратени от %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Преки съобщения до %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Всички преки съобщения, изпратени до %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Липсва текст на съобщението"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Твърде дълго. Може да е най-много %d знака."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 знака."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Получателят не е открит"
-#: 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 ""
"Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
"приятели."
+#. 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 ""
+"Не може да изпращате съобщения до себе си. По-добре си го кажете на себе си "
+"тихичко."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -521,16 +541,21 @@ msgstr "групи в %s"
msgid "Upload failed."
msgstr "Качване на файл"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Не е указана бележка."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "Неправилен размер."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -548,35 +573,23 @@ msgstr "Неправилен размер."
msgid "There was a problem with your session token. Try again, please."
msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Неправилно име или парола!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Да не се изтрива приложението"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -585,15 +598,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Неочаквано изпращане на форма."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Разрешение или забрана на достъпа"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -602,11 +615,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -615,21 +628,44 @@ msgid "Nickname"
msgstr "Псевдоним"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Парола"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Забрана"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Отказ"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Разрешение"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Няма код за потвърждение."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Не сте абонирани за никого."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -793,7 +829,8 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Изтриване"
@@ -846,12 +883,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Не"
@@ -864,12 +902,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -884,9 +923,12 @@ msgstr "Блокиране на потребителя"
msgid "Failed to save block information."
msgstr "Грешка при записване данните за блокирането."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1013,7 +1055,7 @@ msgstr "Не сте собственик на това приложение."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -1038,6 +1080,65 @@ msgstr "Да не се изтрива приложението"
msgid "Delete this application"
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 "За напуснете група, трябва да сте влезли."
+
+#. 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 "Няма псевдоним."
+
+#. 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 "Не членувате в тази група."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s напусна групата %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Изтриване на потребител"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Да не се изтрива бележката"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Изтриване на този потребител"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1111,57 +1212,67 @@ msgstr "Версия"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
#, fuzzy
msgid "Invalid logo URL."
msgstr "Неправилен размер."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Неправилен размер."
+
+#: actions/designadminpanel.php:341
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Смяна на логото"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Лого на сайта"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Лого на сайта"
+
+#: actions/designadminpanel.php:466
#, fuzzy
msgid "Change theme"
msgstr "Промяна"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Път до сайта"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
#, fuzzy
msgid "Theme for the site."
msgstr "Излизане от сайта"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Нова бележка"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Смяна на изображението за фон"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1171,68 +1282,68 @@ msgstr ""
"2MB."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Изкл."
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
#, fuzzy
msgid "Turn background image on or off."
msgstr "Смяна на изображението за фон"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Смяна на изображението за фон"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Смяна на цветовете"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Съдържание"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Страничен панел"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Лиценз"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1242,7 +1353,7 @@ msgstr ""
msgid "Save"
msgstr "Запазване"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
msgstr "Запазване настройките на сайта"
@@ -1725,7 +1836,7 @@ msgstr "Грешка при преобразуване на tokens за одоб
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Непозната версия на протокола OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Грешка при обновяване на отдалечен профил"
@@ -2313,11 +2424,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "За да се присъедините към група, трябва да сте влезли."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Няма псевдоним."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2567,6 +2673,11 @@ msgstr "Не може да изпращате съобщения до този
msgid "No content!"
msgstr "Няма съдържание!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Твърде дълго. Може да е най-много %d знака."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Не е указан получател."
@@ -2723,7 +2834,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Неподдържан формат на данните"
@@ -2874,150 +2985,166 @@ msgstr "Пътища"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Директория на аватара"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Директория на фона"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Страницата не е достъпна във вида медия, който приемате"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Сървър"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Път"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Път до сайта"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Директория на аватара"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Кратки URL-адреси"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
+#: actions/pathsadminpanel.php:265
#, fuzzy
-msgid "Theme server"
+msgid "Server for themes"
+msgstr "Излизане от сайта"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
msgstr "SSL-сървър"
-#: actions/pathsadminpanel.php:268
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
#, fuzzy
-msgid "Theme path"
+msgid "SSL path"
msgstr "Път до сайта"
-#: actions/pathsadminpanel.php:272
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
#, fuzzy
-msgid "Theme directory"
+msgid "Directory"
msgstr "Директория на аватара"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Аватари"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Сървър на аватара"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Път до аватара"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Директория на аватара"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Фонове"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Сървър на фона"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Път до фона"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Директория на фона"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+#, fuzzy
+msgid "Attachments"
+msgstr "Няма прикачени файлове."
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Никога"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Понякога"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Винаги"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Използване на SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Кога да се използва SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-сървър"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Запазване на пътищата"
@@ -3762,7 +3889,7 @@ msgstr "Организация"
msgid "Description"
msgstr "Описание"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистики"
@@ -3899,45 +4026,45 @@ msgstr "Псевдоними"
msgid "Group actions"
msgstr "Потребителски действия"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Емисия с бележки на %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Емисия с бележки на %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Емисия с бележки на %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Изходяща кутия за %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Членове"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Всички членове"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Създадена на"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3947,7 +4074,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3956,7 +4083,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Администратори"
@@ -4885,7 +5012,7 @@ msgid "Plugins"
msgstr "Приставки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Версия"
@@ -5127,7 +5254,7 @@ msgid "Unable to save tag."
msgstr "Грешка при запазване на етикетите."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
@@ -5251,191 +5378,191 @@ msgid "Untitled page"
msgstr "Неозаглавена страница"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "Основна настройка на сайта"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промяна на поща, аватар, парола, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Свързване"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Настройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Излизане от сайта"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Изход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Създаване на нова сметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Регистриране"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Помощ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Търсене"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Основна настройка на сайта"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Помощ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Относно"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Въпроси"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Условия"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Поверителност"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Изходен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Контакт"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Табелка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
@@ -5443,7 +5570,7 @@ msgstr "Лиценз на програмата StatusNet"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5453,7 +5580,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -5462,7 +5589,7 @@ msgstr "**%%site.name%%** е услуга за микроблогване."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5474,50 +5601,50 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Страниране"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Преди"
@@ -5666,12 +5793,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5759,11 +5886,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Отказ"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5791,12 +5913,6 @@ msgstr "Премахване"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-#, fuzzy
-msgid "Attachments"
-msgstr "Няма прикачени файлове."
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6227,14 +6343,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Бележки през SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Свързване"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6935,24 +7051,24 @@ msgstr "Побутване"
msgid "Send a nudge to this user"
msgstr "Побутване на този потребител"
-#: lib/oauthstore.php:283
+#: 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 "Грешка при добавяне на нов абонамент."
@@ -7310,17 +7426,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7328,12 +7444,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "преди около час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7341,12 +7457,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7354,12 +7470,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "преди около месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7367,7 +7483,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index a79645e16..d3be4a559 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:23+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50: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-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -92,14 +92,15 @@ msgstr "Enrollañ"
msgid "No such page."
msgstr "N'eus ket eus ar bajenn-se."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -176,13 +177,13 @@ msgid ""
msgstr ""
#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to them."
msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
+"Perak ne [groufec'h ket ur gont](%%%%action.register%%%%) ha goude-se demata "
+"%s pe postañ ur c'hemenn bennak evitañ."
#. TRANS: H1 text
#: actions/all.php:182
@@ -197,12 +198,13 @@ msgstr "C'hwi hag o mignoned"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -229,7 +231,7 @@ msgstr "N'eo ket bet kavet an hentenn API !"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -301,45 +303,63 @@ msgstr "N'eus ket bet tu da stankañ an implijer."
msgid "Unblock user failed."
msgstr "N'eus ket bet tu da zistankañ an implijer."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Kemennadennoù war-eeun kaset gant %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "An holl gemennadennoù war-eeun kaset gant %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Kemennadennoù war-eeun kaset da %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "An holl gemennadennoù war-eeun kaset da %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Kemenadenn hep testenn !"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
+msgstr[1] "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "N'eo ket bet kavet ar resever."
-#: 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 ""
"Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho "
"mignoned."
+#. 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 ""
+"Na gasit ket a gemennadenn deoc'h c'hwi ho unan ; lavarit an traoù-se en ho "
+"penn kentoc'h."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -347,7 +367,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
#: actions/apifavoritecreate.php:121
msgid "This status is already a favorite."
-msgstr "Ur pennroll eo dija an ali-mañ."
+msgstr "Ur pennroll eo dija ar c'hemenn-mañ."
#. TRANS: Error message text shown when a favorite could not be set.
#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
@@ -522,15 +542,21 @@ msgstr "strolladoù war %s"
msgid "Upload failed."
msgstr "Enporzhiadenn c'hwitet."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Fichenn direizh."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Arventenn oauth_token nann-roet."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Fichenn direizh."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -548,35 +574,23 @@ msgstr "Fichenn direizh."
msgid "There was a problem with your session token. Try again, please."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Lesanv / ger tremen direizh !"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Arabat eo dilemel ar poellad-mañ"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -585,15 +599,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Kinnig ar furmskrid dic'hortoz."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "C'hoant 'zo gant ur poellad kevreañ gant ho kont"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Aotreañ pe nac'h ar moned"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -602,11 +616,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Kont"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -615,23 +629,47 @@ msgid "Nickname"
msgstr "Lesanv"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Ger-tremen"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Nac'hañ"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Nullañ"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Aotreañ"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Aotreañ pe nac'hañ ar moned da ditouroù ho kont."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "N'oc'h ket aotreet."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ezhomm en deus an argerzh-mañ ur POST pe un DELETE."
@@ -653,7 +691,7 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù."
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
#: actions/apistatusesretweet.php:92 lib/command.php:541
msgid "Already repeated that notice."
-msgstr "Adlavaret o peus dija an ali-mañ."
+msgstr "Kemenn bet adkemeret dija."
#: actions/apistatusesshow.php:139
msgid "Status deleted."
@@ -792,7 +830,8 @@ msgid "Preview"
msgstr "Rakwelet"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Diverkañ"
@@ -830,7 +869,7 @@ msgstr "Dilammet eo bet an Avatar."
#: actions/block.php:69
msgid "You already blocked that user."
-msgstr "Stanket o peus dija an implijer-mañ."
+msgstr "Stanket ho peus dija an implijer-mañ."
#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
msgid "Block user"
@@ -845,15 +884,16 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
-msgstr "Nann"
+msgstr "Ket"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
@@ -863,12 +903,13 @@ msgstr "Arabat stankañ an implijer-mañ"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ya"
@@ -883,9 +924,12 @@ msgstr "Stankañ an implijer-mañ"
msgid "Failed to save block information."
msgstr "Diposubl eo enrollañ an titouroù stankañ."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1012,7 +1056,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -1037,6 +1081,64 @@ msgstr "Arabat eo dilemel ar poellad-mañ"
msgid "Delete this application"
msgstr "Dilemel ar poelad-se"
+#. 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 "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
+
+#. 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 "Lesanv pe ID ebet."
+
+#. 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 "N'oc'h ket ezel eus ar strollad-mañ."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Diposubl eo hizivaat ar strollad."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s en deus kuitaet ar strollad %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Diverkañ an implijer"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Arabat dilemel ar c'hemenn-mañ"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Diverkañ an implijer-mañ"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1050,7 +1152,7 @@ msgstr "Nann-luget."
#: actions/deletenotice.php:74
msgid "Can't delete this notice."
-msgstr "Diposupl eo dilemel an ali-mañ."
+msgstr "Dibosupl eo dilemel ar c'hemenn-mañ."
#: actions/deletenotice.php:106
msgid ""
@@ -1064,17 +1166,17 @@ msgstr "Dilemel un ali"
#: actions/deletenotice.php:147
msgid "Are you sure you want to delete this notice?"
-msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?"
+msgstr "Ha sur oc'h ho peus c'hoant dilemel ar c'hemenn-mañ ?"
#. TRANS: Submit button title for 'No' when deleting a notice.
#: actions/deletenotice.php:154
msgid "Do not delete this notice"
-msgstr "Arabat dilemel an ali-mañ"
+msgstr "Arabat dilemel ar c'hemenn-mañ"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
#: actions/deletenotice.php:161 lib/noticelist.php:667
msgid "Delete this notice"
-msgstr "Dilemel an ali-mañ"
+msgstr "Dilemel ar c'hemenn-mañ"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
@@ -1109,53 +1211,63 @@ msgstr "Design"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL fall evit al logo."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL fall evit al logo."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Cheñch al logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo al lec'hienn"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo al lec'hienn"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Lakaat un dodenn all"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Dodenn al lec'hienn"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Dodenn evit al lec'hienn."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Dodenn personelaet"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Kemmañ ar skeudenn foñs"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1163,66 +1275,66 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Gweredekaet"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Diweredekaet"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Adober gant ar skeudenn drekleur"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kemmañ al livioù"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Endalc'h"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barenn kostez"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Testenn"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Liammoù"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Araokaet"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personelaet"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Implijout an talvoudoù dre ziouer"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Adlakaat an neuz dre ziouer."
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Adlakaat an arventennoù dre ziouer"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1232,13 +1344,13 @@ msgstr "Adlakaat an arventennoù dre ziouer"
msgid "Save"
msgstr "Enrollañ"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Enrollañ an design"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "N'eo ket an ali-mañ ur pennroll !"
+msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -1545,9 +1657,8 @@ msgstr ""
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
#: actions/emailsettings.php:423 actions/imsettings.php:386
#: actions/smssettings.php:408
-#, fuzzy
msgid "No pending confirmation to cancel."
-msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
+msgstr "Kadarnadenn ebet da vezañ nullet."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:428
@@ -1583,19 +1694,17 @@ msgstr "Dibosupl eo hizivaat doser an implijer."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:512 actions/smssettings.php:581
-#, fuzzy
msgid "Incoming email address removed."
-msgstr "Chomlec'h postel ebet o tont."
+msgstr "Diverket eo bet ar chomlec'h postel o tont tre."
#. TRANS: Message given after successfully adding an incoming e-mail address.
#: actions/emailsettings.php:536 actions/smssettings.php:605
-#, fuzzy
msgid "New incoming email address added."
-msgstr "Chomlec'h postel ebet o tont."
+msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "Ouzhpennet eo bet an ali-mañ d'ho pennrolloù dija !"
+msgstr "Ouzhpennet eo bet ar c'hemenn-mañ d'ho pennrolloù dija !"
#: actions/favor.php:92 lib/disfavorform.php:144
msgid "Disfavor favorite"
@@ -1708,7 +1817,7 @@ msgstr "Dibosupl eo kaout ur jedaouer reked."
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Fazi en ur hizivaat ar profil a-bell."
@@ -2259,10 +2368,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Lesanv pe ID ebet."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2420,7 +2525,7 @@ msgstr ""
#: actions/login.php:269
msgid "Lost or forgotten password?"
-msgstr "Ha kollet o peus ho ker-tremen ?"
+msgstr "Ha kollet ho peus ho ker-tremen ?"
#: actions/login.php:288
msgid ""
@@ -2439,7 +2544,7 @@ msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
msgid ""
"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"N'o peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur "
+"N'ho peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur "
"gont nevez."
#: actions/makeadmin.php:92
@@ -2509,9 +2614,14 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
msgid "No content!"
msgstr "Goullo eo !"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
-msgstr "N'o peus ket lakaet a resever."
+msgstr "N'ho peus ket lakaet a resever."
#. TRANS: Error text shown when trying to send a direct message to self.
#: actions/newmessage.php:164 lib/command.php:503
@@ -2612,12 +2722,12 @@ msgstr "Poelladoù OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr "Ar poelladoù o peus enrollet"
+msgstr "Ar poelladoù ho peus enrollet"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr "N'o peus enrollet poellad ebet evit poent."
+msgstr "N'ho peus enrollet poellad ebet evit poent."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
@@ -2637,9 +2747,8 @@ msgid "Unable to revoke access for app: %s."
msgstr "Dibosupl eo nullañ moned ar poellad : "
#: actions/oauthconnectionssettings.php:198
-#, fuzzy
msgid "You have not authorized any applications to use your account."
-msgstr "N'o peus enrollet poellad ebet evit poent."
+msgstr "N'ho peus aotreet poellad ebet da implijout ho kont."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
@@ -2668,7 +2777,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
#, fuzzy
msgid "Not a supported data format."
msgstr "Diembreget eo ar furmad-se."
@@ -2823,149 +2932,165 @@ msgstr "Hentoù"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Lec'hienn"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servijer"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Anv ostiz servijer al lec'hienn."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Hent"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Hent al lec'hienn"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Doser an temoù"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URLioù brav"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Danvez"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servijer danvezioù"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Dodenn evit al lec'hienn."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Hentad an tem"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servijer SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Hent al lec'hienn"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Doser an temoù"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avataroù"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servijer avatar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Hent an avataroù"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Restroù an avataroù"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Backgroundoù"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servijer ar backgroundoù"
-
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:313
-#, fuzzy
-msgid "Background directory"
-msgstr "Servijer ar backgroundoù"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Pezhioù stag"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Morse"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "A-wechoù"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Atav"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Implijout SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Peur implijout SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servijer SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Enrollañ an hentadoù."
@@ -3295,7 +3420,8 @@ msgstr "Lesanv pe chomlec'h postel"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel o peus enrollet."
+msgstr ""
+"Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel ho peus enrollet."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3518,7 +3644,7 @@ msgstr "Lesanv an implijer"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr "Lesanv an implijer o peus c'hoant heuliañ"
+msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -3563,7 +3689,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
#: actions/repeat.php:90
msgid "You already repeated that notice."
-msgstr "Adkemeret o peus dija an ali-mañ."
+msgstr "Adkemeret ho peus ar c'hemenn-mañ c'hoazh."
#: actions/repeat.php:114 lib/noticelist.php:686
msgid "Repeated"
@@ -3708,7 +3834,7 @@ msgstr "Aozadur"
msgid "Description"
msgstr "Deskrivadur"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Stadegoù"
@@ -3732,7 +3858,7 @@ msgstr "Titouroù ar poelad"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr "Alc'hwez an implijer"
+msgstr "Alc'hwez implijer"
#: actions/showapplication.php:268
msgid "Consumer secret"
@@ -3759,7 +3885,7 @@ msgstr ""
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr ""
-"Ha sur oc'h o peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
+"Ha sur oc'h ho peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?"
#: actions/showfavorites.php:79
#, php-format
@@ -3843,45 +3969,45 @@ msgstr "Aliasoù"
msgid "Group actions"
msgstr "Obererezh ar strollad"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Neudenn alioù ar strollad %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Neudenn alioù ar strollad %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Neudenn alioù ar strollad %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Mignon ur mignon evit ar strollad %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Izili"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Hini ebet)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "An holl izili"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Krouet"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3893,7 +4019,7 @@ msgstr ""
"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3904,7 +4030,7 @@ msgstr ""
"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Merourien"
@@ -4193,7 +4319,7 @@ msgstr "Kod kadarnaat"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr "Lakait ar c'hod o peus resevet war ho pellgomzer hezoug."
+msgstr "Lakait ar c'hod ho peus resevet war ho pellgomzer hezoug."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
@@ -4421,7 +4547,8 @@ msgstr ""
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr ""
-"n'ez eus den ebet koumanantet da %s. Ha c'hoant o peus bezañ an hini gentañ ?"
+"n'ez eus den ebet koumanantet da %s. Ha c'hoant ho peus bezañ an hini "
+"gentañ ?"
#: actions/subscribers.php:114
#, fuzzy, php-format
@@ -4545,7 +4672,7 @@ msgstr "N'eus ket eus ar bajenn-se."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
-msgstr "N'o peus ket stanket an implijer-mañ."
+msgstr "N'ho peus ket stanket an implijer-mañ."
#: actions/unsandbox.php:72
#, fuzzy
@@ -4835,7 +4962,7 @@ msgid "Plugins"
msgstr "Pluginoù"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Stumm"
@@ -5067,7 +5194,7 @@ msgid "Unable to save tag."
msgstr "Dibosupl eo enrollañ an tikedenn."
#. 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 "Nac'het ez eus bet deoc'h en em goumanantiñ."
@@ -5187,187 +5314,187 @@ msgid "Untitled page"
msgstr "Pajenn hep anv"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "Arventennoù diazez al lec'hienn"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Liammañ d'ar servijoù"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Kevreañ"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Kemmañ arventennoù al lec'hienn"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Merañ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Pediñ"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Digevreañ diouzh al lec'hienn"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Digevreañ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Krouiñ ur gont"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "En em enskrivañ"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kevreañ d'al lec'hienn"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Kevreañ"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Sikour din !"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Skoazell"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Klask tud pe un tamm testenn"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Klask"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Ali al lec'hienn"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Selloù lec'hel"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Ali ar bajenn"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "Arventennoù diazez al lec'hienn"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Skoazell"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Diwar-benn"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAG"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "AIH"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Prevezded"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Mammenn"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Darempred"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Badj"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Aotre-implijout ar meziant StatusNet"
@@ -5375,7 +5502,7 @@ msgstr "Aotre-implijout ar meziant StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5383,7 +5510,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -5392,7 +5519,7 @@ msgstr "**%%site.name%%** a zo ur servij microblogging."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5401,50 +5528,50 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, fuzzy, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Pajennadur"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "War-lerc'h"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Kent"
@@ -5585,12 +5712,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5673,11 +5800,6 @@ msgstr "Lenn-skrivañ"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Nullañ"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5704,11 +5826,6 @@ msgstr "Disteuler"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Pezhioù stag"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -5829,7 +5946,7 @@ msgstr ""
#. TRANS: Text shown when a notice has been marked as favourite successfully.
#: lib/command.php:312
msgid "Notice marked as fave."
-msgstr "Ali bet ouzhpennet d'ar pennroll."
+msgstr "Kemenn bet ouzhpennet d'ar pennroll."
#. 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.
@@ -5887,7 +6004,7 @@ msgstr ""
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet."
+"arouezenn ho peus lakaet."
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
#: lib/command.php:514
@@ -6139,14 +6256,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Hizivadennoù dre SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Kevreadennoù"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6827,7 +6944,7 @@ msgstr "Adkemeret gant"
#: lib/noticelist.php:640
msgid "Reply to this notice"
-msgstr "Respont d'an ali-mañ"
+msgstr "Respont d'ar c'hemenn-mañ"
#: lib/noticelist.php:641
msgid "Reply"
@@ -6849,24 +6966,24 @@ msgstr "Blinkadenn"
msgid "Send a nudge to this user"
msgstr "Kas ur blinkadenn d'an implijer-mañ"
-#: lib/oauthstore.php:283
+#: 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
#, fuzzy
msgid "Couldn't insert new subscription."
msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -6889,7 +7006,7 @@ msgstr "Boest resev"
#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
-msgstr "ar gemennadennoù o peus resevet"
+msgstr "Ar gemennadennoù ho peus resevet"
#: lib/personalgroupnav.php:130
msgid "Outbox"
@@ -6974,7 +7091,7 @@ msgstr "Arguzenn ID ebet."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr "Adkregiñ gant an ali-mañ ?"
+msgstr "Adkregiñ gant ar c'hemenn-mañ ?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6982,7 +7099,7 @@ msgstr "Ya"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "Adkregiñ gant an ali-mañ"
+msgstr "Adkregiñ gant ar c'hemenn-mañ"
#: lib/revokeroleform.php:91
#, fuzzy, php-format
@@ -7228,17 +7345,17 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7246,12 +7363,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7259,12 +7376,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7272,12 +7389,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7285,7 +7402,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 2ba3d3537..d41a37b5b 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
# Author: Aleator
# Author: McDutchie
# Author: Paucabot
+# Author: SMP
# Author: Toniher
# --
# This file is distributed under the same license as the StatusNet package.
@@ -12,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:25+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:34+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -95,14 +96,15 @@ msgstr "Desa"
msgid "No such page."
msgstr "No existeix la pàgina."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -204,12 +206,13 @@ msgstr "Un mateix i amics"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualitzacions de %1$s i amics a %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -236,7 +239,7 @@ msgstr "No s'ha trobat el mètode API!"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -312,45 +315,61 @@ msgstr "Ha fallat el blocatge de l'usuari."
msgid "Unblock user failed."
msgstr "Ha fallat el desblocatge de l'usuari."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Missatges directes de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Tots els missatges directes enviats per %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Missatges directes a %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Tots els missatges directes enviats a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "No hi ha text al missatge!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "És massa llarg. La mida màxima del missatge és %d caràcters."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "És massa llarg. La mida màxima del missatge és %d caràcters."
+msgstr[1] "És massa llarg. La mida màxima del missatge és %d caràcters."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "No s'ha trobat l'usuari destinatari."
-#: 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 ""
"No es pot enviar missatges directes a usuaris que no siguin els vostres "
"amics."
+#. 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 "No t'enviïs missatges a tu mateix, simplement dir-te això."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -532,15 +551,21 @@ msgstr "grups sobre %s"
msgid "Upload failed."
msgstr "La pujada ha fallat."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "No s'ha proporcionat cap paràmetre oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "El testimoni no és vàlid."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -560,36 +585,22 @@ msgstr ""
"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
"us plau."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nom d'usuari / contrasenya no vàlid!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Error de la base de dades en esborrar l'usuari de l'aplicació OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"S'ha autoritzat el testimoni de sol·licitud %s. Si us plau, canvieu-lo per "
-"un testimoni d'accés."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -598,15 +609,15 @@ msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
msgid "Unexpected form submission."
msgstr "Enviament de formulari inesperat."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Una aplicació voldria connectar-se al vostre compte"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permet o denega l'accés"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -618,11 +629,11 @@ msgstr ""
"hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -631,23 +642,47 @@ msgid "Nickname"
msgstr "Sobrenom"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasenya"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Denega"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancel·la"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permet"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permet o denega l'accés a la informació del vostre compte."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "S'ha cancel·lat la confirmació de MI."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "No esteu autoritzat."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Aquest mètode requereix POST o DELETE."
@@ -809,7 +844,8 @@ msgid "Preview"
msgstr "Vista prèvia"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Elimina"
@@ -867,12 +903,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -885,12 +922,13 @@ msgstr "No bloquis l'usuari"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
@@ -905,9 +943,12 @@ msgstr "Bloca aquest usuari"
msgid "Failed to save block information."
msgstr "No s'ha pogut desar la informació del bloc."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1033,7 +1074,7 @@ msgstr "No sou el propietari d'aquesta aplicació."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
@@ -1061,6 +1102,67 @@ msgstr "No eliminis l'aplicació"
msgid "Delete this application"
msgstr "Elimina aquesta aplicació"
+#. 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 "Heu d'haver iniciat una sessió per deixar un grup."
+
+#. 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 "Cap sobrenom o 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 "No sou un membre del grup."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "No s'ha pogut actualitzar el grup."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ha abandonat el grup %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Elimina l'usuari"
+
+#: 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 ""
+"Esteu segur que voleu eliminar l'usuari? S'esborraran totes les dades de "
+"l'usuari de la base de dades, sense cap còpia de seguretat."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "No eliminis aquest avís"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Elimina l'usuari"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1135,55 +1237,65 @@ msgstr "Disseny"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "L'URL del logotip no és vàlid."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "L'URL del logotip no és vàlid."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Canvia el logotip"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logotip del lloc"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logotip del lloc"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Canvia el tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema del lloc"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema del lloc."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Tema personalitzat"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Podeu pujar un tema personalitzat de l'StatusNet amb un arxiu ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Canvia la imatge de fons"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fons"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1192,66 +1304,66 @@ msgstr ""
"Podeu pujar una imatge de fons per al lloc. La mida màxima de fitxer és %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Activada"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivada"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activa o desactiva la imatge de fons."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Posa en mosaic la imatge de fons"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Canvia els colors"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contingut"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Enllaços"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avançat"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalitzat"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilitza els paràmetres per defecte"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaura els dissenys per defecte"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Torna a restaurar al valor per defecte"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1261,7 +1373,7 @@ msgstr "Torna a restaurar al valor per defecte"
msgid "Save"
msgstr "Desa"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Desa el disseny"
@@ -1736,7 +1848,7 @@ msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "El servei remot utilitza una versió desconeguda del protocol OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "S'ha produït un error en actualitzar el perfil remot."
@@ -2333,10 +2445,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Cap sobrenom o ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2368,33 +2476,36 @@ msgstr "Llicència d'aquest lloc basat en StatusNet"
#: actions/licenseadminpanel.php:139
msgid "Invalid license selection."
-msgstr ""
+msgstr "La selecció de la llicència no és vàlida."
#: actions/licenseadminpanel.php:149
msgid ""
"You must specify the owner of the content when using the All Rights Reserved "
"license."
msgstr ""
+"Heu d'especificar el propietari del contingut quan utilitzeu la llicència "
+"«Tots els drets reservats»."
#: actions/licenseadminpanel.php:156
msgid "Invalid license title. Max length is 255 characters."
msgstr ""
+"El títol de la llicència no és vàlid. La longitud màxima és 255 caràcters."
#: actions/licenseadminpanel.php:168
msgid "Invalid license URL."
-msgstr ""
+msgstr "L'URL de la llicència no és vàlid."
#: actions/licenseadminpanel.php:171
msgid "Invalid license image URL."
-msgstr ""
+msgstr "L'URL de la imatge de la llicència no és vàlid."
#: actions/licenseadminpanel.php:179
msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "L'URL de la llicència ha de ser en blanc o bé un URL vàlid."
#: actions/licenseadminpanel.php:187
msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "La imatge de la llicència ha de ser en blanc o bé un URL vàlid."
#: actions/licenseadminpanel.php:239
msgid "License selection"
@@ -2446,7 +2557,7 @@ msgstr "URL de la llicència"
#: actions/licenseadminpanel.php:293
msgid "URL for more information about the license."
-msgstr ""
+msgstr "URL per a més informació de la llicència."
#: actions/licenseadminpanel.php:300
msgid "License Image URL"
@@ -2583,6 +2694,11 @@ msgstr "No podeu enviar un misssatge a aquest usuari."
msgid "No content!"
msgstr "Cap contingut!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "És massa llarg. La mida màxima del missatge és %d caràcters."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "No has especificat el destinatari."
@@ -2701,7 +2817,7 @@ msgstr "Aplicacions connectades"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access your account."
-msgstr ""
+msgstr "Heu permès les aplicacions següents accedir al vostre compte."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2745,7 +2861,7 @@ msgstr "Si us plau, només URL %s sobre HTTP pla."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2894,149 +3010,168 @@ msgstr "Camins"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "Camí i paràmetres del servidor d'aquest lloc basat en StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "No es pot llegir el directori de temes: %s"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "No es pot escriure al directori d'avatars: %s"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "No es pot escriure al directori de fons: %s"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "No es pot llegir el directori de les traduccions: %s"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "El servidor SSL no és vàlid. La mida màxima és de 255 caràcters."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Lloc"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servidor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Servidor central del lloc."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Camí"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Camí del lloc"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "El camí a les traduccions"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directori de temes"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "El camí del directori a les traduccions"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URL atractius"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servidor dels temes"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema del lloc."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Camí dels temes"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servidor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Camí del lloc"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directori de temes"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "El camí del directori a les traduccions"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servidor d'avatars"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Camí de l'avatar"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directori d'avatars"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fons"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servidor de fons"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Camí dels fons"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directori de fons"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Adjuncions"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Mai"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "A vegades"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Utilitza l'SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quan utilitzar l'SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servidor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servidor on dirigir les sol·licituds SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Desa els camins"
@@ -3808,7 +3943,7 @@ msgstr "Organització"
msgid "Description"
msgstr "Descripció"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estadístiques"
@@ -3950,45 +4085,45 @@ msgstr "Àlies"
msgid "Group actions"
msgstr "Accions del grup"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Canal d'avisos del grup %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Canal d'avisos del grup %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Canal d'avisos del grup %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Safata de sortida per %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membres"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Cap)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Tots els membres"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "S'ha creat"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4004,7 +4139,7 @@ msgstr ""
"%) per formar part del grup i molt més! ([Més informació...](%%%%doc.help%%%"
"%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4017,7 +4152,7 @@ msgstr ""
"[StatusNet](http://status.net/). Els seus membre comparteixen missatges "
"curts sobre llur vida i interessos. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administradors"
@@ -4978,7 +5113,7 @@ msgid "Plugins"
msgstr "Connectors"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versió"
@@ -5217,7 +5352,7 @@ msgid "Unable to save tag."
msgstr "No s'ha pogut desar l'etiqueta."
#. 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 "Se us ha banejat la subscripció."
@@ -5337,185 +5472,185 @@ msgid "Untitled page"
msgstr "Pàgina sense titol"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connecta als serveis"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Connexió"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convida amics i coneguts perquè participin a %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Convida"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Finalitza la sessió"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registre"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Inici de sessió"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajuda'm!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Avís del lloc"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vistes locals"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Avís de pàgina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Quant a"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Preguntes més freqüents"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Termes del servei"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privadesa"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Font"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contacte"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insígnia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
@@ -5523,7 +5658,7 @@ msgstr "Llicència del programari StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5533,7 +5668,7 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** és un servei de microblogging."
@@ -5542,7 +5677,7 @@ msgstr "**%%site.name%%** és un servei de microblogging."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5554,27 +5689,27 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "El contingut i les dades de %1$s són privades i confidencials."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"El contingut i les dades són copyright de %1$s. Tots els drets reservats."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"El contingut i les dades són copyright dels col·laboradors. Tots els drets "
@@ -5582,7 +5717,7 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5590,19 +5725,19 @@ msgstr ""
"llicència %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginació"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Posteriors"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Anteriors"
@@ -5727,33 +5862,33 @@ msgstr ""
#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
#: lib/apiauth.php:175
msgid "No application for that consumer key."
-msgstr ""
+msgstr "No hi ha cap aplicació per a aquest clau de consumidor."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Testimoni d'accés incorrecte."
#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
#: lib/apiauth.php:217
msgid "No user for that token."
-msgstr ""
+msgstr "No hi ha cap usuari per aquest testimoni."
#. 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
msgid "Could not authenticate you."
-msgstr ""
+msgstr "No se us ha pogut autenticar."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "S'ha provat de revocar el testimoni desconegut."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "No s'ha pogut suprimir el testimoni revocat."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5835,11 +5970,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancel·la"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5864,12 +5994,7 @@ msgstr "Revoca"
#: lib/atom10feed.php:112
msgid "author element must contain a name element."
-msgstr ""
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Adjuncions"
+msgstr "l'element autor ha de contenir un element nom."
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
@@ -6334,14 +6459,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Actualitzacions per SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexions"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Aplicacions de connexió autoritzades"
@@ -7025,7 +7150,7 @@ msgstr ""
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "«%s» no és un tipus de fitxer compatible en aquest servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -7142,24 +7267,24 @@ msgstr "Crida l'atenció"
msgid "Send a nudge to this user"
msgstr "Crida l'atenció a l'usuari"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "S'ha produït un error en inserir un perfil nou."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "S'ha produït un error en inserir un avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "S'ha produït un error en inserir un perfil remot."
#. 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 "Avís duplicat."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "No s'ha pogut inserir una nova subscripció."
@@ -7513,64 +7638,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1184
+#: lib/util.php:1194
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 ea2b6f04a..c712e8e2f 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -10,18 +10,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:26+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:35+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -92,14 +92,15 @@ msgstr "Uložit"
msgid "No such page."
msgstr "Tady žádná taková stránka není."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "Vy a přátelé"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr " API metoda nebyla nalezena."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -308,43 +310,60 @@ msgstr "Zablokovat uživatele se nezdařilo."
msgid "Unblock user failed."
msgstr "Odblokovat uživatele se nezdařilo."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Přímá zpráva od %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Všechny přímé zprávy od uživatele %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Přímé zprávy uživateli %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Všechny přímé zprávy odeslané uživateli %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "zpráva bez textu!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
+msgstr[1] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
+msgstr[2] "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Příjemce nebyl nalezen."
-#: 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 "Nelze odesílat zprávy uživatelům, kteří nejsou vašimi přáteli."
+#. 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 "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -524,15 +543,21 @@ msgstr "skupiny na %s"
msgid "Upload failed."
msgstr "Nahrání se nezdařilo."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Neplatný přihlašovací token."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "nebyl dodán parametr oauth_token"
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Neplatný token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -550,35 +575,22 @@ msgstr "Neplatný token."
msgid "There was a problem with your session token. Try again, please."
msgstr "Nastal problém s vaším session tokenem. Zkuste to znovu, prosím."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Neplatné jméno nebo heslo!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Chyba databáze při mazání uživatele aplikace OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Token požadavku %s byl autorizován. Prosím vyměňte jej za přístupový token."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Token žádosti %s byl odepřen a zrušen."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -587,15 +599,15 @@ msgstr "Token žádosti %s byl odepřen a zrušen."
msgid "Unexpected form submission."
msgstr "Nečekaný požadavek."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Aplikace se chce připojit k vašemu účtu"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Povolit nebo zamítnout přístup"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -607,11 +619,11 @@ msgstr ""
"vašeho účtu na %4$s jen třetím stranám kterým věříte.."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Účet"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -620,23 +632,47 @@ msgid "Nickname"
msgstr "Přezdívka"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Heslo"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Odepřít"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Zrušit"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Povolit"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Povolit nebo zakázat přístup k vašemu účtu."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM potvrzení zrušeno."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Token žádosti %s byl odepřen a zrušen."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Nejste autorizován."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Tato metoda vyžaduje POST nebo DELETE."
@@ -797,7 +833,8 @@ msgid "Preview"
msgstr "Náhled"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Odstranit"
@@ -853,12 +890,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Poznámka"
@@ -871,12 +909,13 @@ msgstr "Zablokovat tohoto uživatele"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ano"
@@ -891,9 +930,12 @@ msgstr "Zablokovat tohoto uživatele"
msgid "Failed to save block information."
msgstr "Nepodařilo se uložit blokování."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1019,7 +1061,7 @@ msgstr "Nejste vlastníkem této aplikace."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Nastal problém s vaším session tokenem."
@@ -1046,6 +1088,67 @@ msgstr "Neodstraňujte tuto aplikaci"
msgid "Delete this application"
msgstr "Odstranit tuto aplikaci"
+#. 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 "Musíte být přihlášen abyste mohl opustit skupinu."
+
+#. 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 "Žádná přezdívka nebo 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 "Nejste členem této skupiny."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Nelze aktualizovat skupinu."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s opustil(a) skupinu %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Smazat uživatele"
+
+#: 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 ""
+"Jste si jisti, že chcete smazat tohoto uživatele? To odstraní všechny údaje "
+"o uživateli z databáze, bez zálohy."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Neodstraňujte toto oznámení"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Odstranit tohoto uživatele"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1122,53 +1225,63 @@ msgstr "Vzhled"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Neplatná URL loga."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Neplatná URL loga."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Téma není k dispozici: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Změňte logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo stránek"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo stránek"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Změnit téma"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Téma stránek"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Téma stránek"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Vlastní téma"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Můžete nahrát vlastní StatusNet téma jako .ZIP archiv."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Změnit obrázek na pozadí"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadí"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1177,66 +1290,66 @@ msgstr ""
"Můžete nahrát obrázek na pozadí stránek. Maximální velikost souboru je %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "zap."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "vyp."
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Zapněte nebů vypněte obrázek na pozadí."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Dlaždicovat obrázek na pozadí"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Změnit barvy"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Obsah"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Boční panel"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Odkazy"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Rozšířené"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Vlastní CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Použít výchozí"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Obnovit výchozí vzhledy"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reset zpět do výchozího"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1246,7 +1359,7 @@ msgstr "Reset zpět do výchozího"
msgid "Save"
msgstr "Uložit"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Uložit vzhled"
@@ -1719,7 +1832,7 @@ msgstr "Nemohu převést žádost token na přístup token."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Vzdálená služba používá neznámou verzi protokolu OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Chyba při aktualizaci vzdáleného profilu."
@@ -2310,10 +2423,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Musíte být přihlášen pro vstup do skupiny."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Žádná přezdívka nebo ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2558,6 +2667,11 @@ msgstr ""
msgid "No content!"
msgstr "Chybí obsah!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální délka sdělení je %d znaků."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Neuveden příjemce."
@@ -2717,7 +2831,7 @@ msgstr "Only %s URLs over plain HTTP please."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Nepodporovaný formát dat."
@@ -2867,147 +2981,166 @@ msgstr "Cesty"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Adresář témat není čitelný: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Nelze zapisovat do adresáře avatarů: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Nelze zapisovat do adresáře pozadí: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Locales adresář není čitelný: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Neplatný SSL server. Maximální délka je 255 znaků."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Stránky"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Hostname (jméno) serveru stránek."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Cesta"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Cesta ke stránkám (za jménem serveru)"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Cesta k locales"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "adresář tématu"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Cesta k adresáři locales"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Hezké URL"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Použijte Fancy (více čitelné a zapamatovatelné) URL?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Téma"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "server s tématy"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Téma stránek"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "cesta k tématu"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL server"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Cesta ke stránkám (za jménem serveru)"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "adresář tématu"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Cesta k adresáři locales"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatary"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Server s avatary"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Cesta k avatarům"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Adresář avatarů"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Pozadí"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Server s pozadím"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Cesta k pozadí"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Adresář pozadí"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Přílohy"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nikdy"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Někdy"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Vždy"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Použít SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Kdy použít SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Server kam směrovat SSL žádosti"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Uložit cesty"
@@ -3764,7 +3897,7 @@ msgstr "Organizace"
msgid "Description"
msgstr "Popis"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistiky"
@@ -3906,45 +4039,45 @@ msgstr "Aliasy"
msgid "Group actions"
msgstr "Akce skupiny"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Feed sdělení skupiny %s (RSS 1.0"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Feed sdělení skupiny %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Feed sdělení skupiny %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF pro skupinu %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Členové"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(nic)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Všichni členové"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Vytvořeno"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3959,7 +4092,7 @@ msgstr ""
"životě a zájmech. [Zaregistrujte se](%%action.register%%) a staňte se členem "
"této skupiny a mnoha dalších! ([Čtěte více](%%doc.help%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3972,7 +4105,7 @@ msgstr ""
"[StatusNet](http://status.net/). Její členové sdílejí krátké zprávy o svém "
"životě a zájmech. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Adminové"
@@ -4921,7 +5054,7 @@ msgid "Plugins"
msgstr "Pluginy"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Verze"
@@ -5155,7 +5288,7 @@ msgid "Unable to save tag."
msgstr "Nelze uložit tag."
#. 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 "Byl jste vykázán (banned) z přihlašování se."
@@ -5275,185 +5408,185 @@ msgid "Untitled page"
msgstr "stránka bez názvu"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Primární navigace na webu"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Osobní profil a časová osa přátel"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Osobní"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Změňte svůj e-mail, avatar, heslo, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Připojení ke službám"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Připojit"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Změna konfigurace webu"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Pozvat"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Odhlášení z webu"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Odhlásit se"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Zaregistrujte se"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrovat"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Přihlásit se na stránky"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Přihlásit"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Nápověda"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Nápověda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Vyhledávání osob nebo textu"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Hledat"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Sdělení"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Místní zobrazení"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Sdělení stránky"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Sekundární navigace na webu"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Nápověda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "O nás"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "TOS (pravidla použití služby)"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Soukromí"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Zdroj"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Odznak"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licence softwaru StatusNet"
@@ -5461,7 +5594,7 @@ msgstr "Licence softwaru StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5471,7 +5604,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** je služba mikroblogů."
@@ -5480,7 +5613,7 @@ msgstr "**%%site.name%%** je služba mikroblogů."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5492,50 +5625,50 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licence k obsahu stránek"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Obsah a data z %1$S jsou soukromé a důvěrné."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Obsah a data copyright %1$s. Všechna práva vyhrazena."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr "Obsah a data copyright přispěvatelů. Všechna práva vyhrazena."
#. 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Všechen obsah a data %1$s jsou k dispozici v rámci licence %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Stránkování"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Po"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Před"
@@ -5677,12 +5810,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5766,11 +5899,6 @@ msgstr "čtení a zápis"
msgid "Default access for this application: read-only, or read-write"
msgstr "Výchozí přístup pro tuto aplikaci: pouze pro čtení, nebo číst-psát"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Zrušit"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5797,11 +5925,6 @@ msgstr "Obnovit"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Přílohy"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6265,14 +6388,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Aktualizace z a na SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Připojení"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Autorizované propojené aplikace"
@@ -7070,24 +7193,24 @@ msgstr "Pošťouchnout"
msgid "Send a nudge to this user"
msgstr "Poslat pošťouchnutí tomuto uživateli"
-#: lib/oauthstore.php:283
+#: 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 "Nelze vložit odebírání"
@@ -7441,17 +7564,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7460,12 +7583,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7474,12 +7597,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7488,12 +7611,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7502,7 +7625,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 310e450af..36f5d8ca3 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:27+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50: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-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -101,14 +101,15 @@ msgstr "Speichern"
msgid "No such page."
msgstr "Seite nicht vorhanden"
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -210,12 +211,13 @@ msgstr "Du und Freunde"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -242,7 +244,7 @@ msgstr "API-Methode nicht gefunden."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -318,46 +320,64 @@ msgstr "Blockieren des Benutzers fehlgeschlagen."
msgid "Unblock user failed."
msgstr "Freigeben des Benutzers fehlgeschlagen."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direkte Nachrichten von %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle von %s gesendeten direkten Nachrichten"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direkte Nachrichten an %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle an %s gesendeten direkten Nachrichten"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Fehlender Nachrichtentext!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] ""
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist %d Zeichen."
+msgstr[1] ""
"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist %d Zeichen."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Empfänger nicht gefunden."
-#: 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 ""
"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
"du nicht befreundet bist."
+#. 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 ""
+"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -471,7 +491,7 @@ msgstr "Ungültiges Alias: „%s“"
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
+msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
#: actions/apigroupcreate.php:290 actions/editgroup.php:238
#: actions/newgroup.php:178
@@ -541,15 +561,21 @@ msgstr "Gruppen von %s"
msgid "Upload failed."
msgstr "Hochladen fehlgeschlagen."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Login-Token ungültig oder abgelaufen."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Kein oauth_token Parameter angegeben."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Ungültiges Token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -567,36 +593,22 @@ msgstr "Ungültiges Token."
msgid "There was a problem with your session token. Try again, please."
msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Benutzername oder Passwort falsch."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Datenbankfehler beim Löschen des OAuth Anwendungs Nutzers."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Die Anfrage %s wurde nicht autorisiert. Bitte gegen einen Zugriffstoken "
-"austauschen."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -605,15 +617,15 @@ msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
msgid "Unexpected form submission."
msgstr "Unerwartete Formulareingabe."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Ein Programm will eine Verbindung zu deinem Konto aufbauen"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Zugriff erlauben oder ablehnen"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -625,11 +637,11 @@ msgstr ""
"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Profil"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -638,23 +650,47 @@ msgid "Nickname"
msgstr "Benutzername"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passwort"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Ablehnen"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Abbrechen"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Erlauben"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Zugang zu deinem Konto erlauben oder ablehnen"
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM-Bestätigung abgebrochen."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Du bist nicht autorisiert."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Diese Methode benötigt ein POST oder DELETE."
@@ -821,7 +857,8 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Löschen"
@@ -878,12 +915,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nein"
@@ -896,12 +934,13 @@ msgstr "Diesen Benutzer freigeben"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -916,9 +955,12 @@ msgstr "Diesen Benutzer blockieren"
msgid "Failed to save block information."
msgstr "Konnte Blockierungsdaten nicht speichern."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1044,7 +1086,7 @@ msgstr "Du bist Besitzer dieses Programms"
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1071,6 +1113,67 @@ msgstr "Dieses Programm nicht löschen"
msgid "Delete this application"
msgstr "Programm löschen"
+#. 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 "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
+
+#. 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 "Kein Benutzername oder 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 "Du bist kein Mitglied dieser Gruppe."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Konnte Gruppe nicht aktualisieren."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s hat die Gruppe %2$s verlassen"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Benutzer löschen"
+
+#: 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 ""
+"Bist du sicher, dass du den Benutzer löschen wisst? Alle Daten des Benutzers "
+"werden aus der Datenbank gelöscht (ohne ein Backup)."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Diese Nachricht nicht löschen"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Diesen Benutzer löschen"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1147,53 +1250,63 @@ msgstr "Design"
msgid "Design settings for this StatusNet site"
msgstr "Design-Einstellungen dieser StatusNet-Website"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Ungültige URL für das Logo"
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Ungültige URL für das Logo"
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Theme nicht verfügbar: %s"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Logo ändern"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Seitenlogo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Seitenlogo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Theme ändern"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Seitentheme"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Theme dieser Seite."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Angepasster Skin"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Hintergrundbild ändern"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Hintergrund"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1203,66 +1316,66 @@ msgstr ""
"Dateigröße beträgt %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "An"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Aus"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Hintergrundbild ein- oder ausschalten."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Hintergrundbild kacheln"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Farben ändern"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Inhalt"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Seitenleiste"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Erweitert"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Eigene CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardeinstellungen benutzen"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standard-Design wiederherstellen"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standard wiederherstellen"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1272,7 +1385,7 @@ msgstr "Standard wiederherstellen"
msgid "Save"
msgstr "Speichern"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Design speichern"
@@ -1750,7 +1863,7 @@ msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Service nutzt unbekannte OMB-Protokollversion."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Fehler beim Aktualisieren des entfernten Profils."
@@ -1947,7 +2060,7 @@ msgstr "Diesen Benutzer zum Admin ernennen"
#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
-msgstr "%s Zeitleiste"
+msgstr "%s-Zeitleiste"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#: actions/grouprss.php:142
@@ -2353,10 +2466,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Kein Benutzername oder ID"
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2602,6 +2711,12 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
msgid "No content!"
msgstr "Kein Inhalt!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist %d Zeichen."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Kein Empfänger angegeben."
@@ -2767,7 +2882,7 @@ msgstr "Bitte nur %s URLs über einfaches HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2916,147 +3031,166 @@ msgstr "Pfad"
msgid "Path and server settings for this StatusNet site"
msgstr "Pfad- und Servereinstellungen dieser StatusNet-Website"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Theme-Verzeichnis nicht lesbar: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Sprachverzeichnis nicht lesbar: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ungültiger SSL-Server. Die maximale Länge ist 255 Zeichen."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Seite"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Server-Name der Seite"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Pfad"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Seitenpfad"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Sprachverzeichnis"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Theme-Verzeichnis"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Pfad zu den Sprachen"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Schicke URLs."
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Motiv"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Motiv-Server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Theme dieser Seite."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Motiv-Pfad"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-Server"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Seitenpfad"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Theme-Verzeichnis"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Pfad zu den Sprachen"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatare"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar-Server"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avatarpfad"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatarverzeichnis"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Hintergrundbilder"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Server für Hintergrundbilder"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Pfad zu den Hintergrundbildern"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Hintergrund-Verzeichnis"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Anhänge"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nie"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Manchmal"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Immer"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL verwenden"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Wann soll SSL verwendet werden"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-Server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Server an den SSL Anfragen gerichtet werden sollen"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Speicherpfade"
@@ -3271,7 +3405,7 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-"Dies ist die öffentliche Zeitlinie von %%site.name%% es wurde allerdings "
+"Dies ist die öffentliche Zeitleiste von %%site.name%%, es wurde allerdings "
"noch nichts gepostet."
#: actions/public.php:191
@@ -3474,7 +3608,7 @@ msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
#: actions/register.php:99
msgid "Sorry, invalid invitation code."
-msgstr "Entschuldigung, ungültiger Bestätigungscode."
+msgstr "Entschuldigung, ungültiger Einladungscode."
#: actions/register.php:119
msgid "Registration successful"
@@ -3486,7 +3620,7 @@ msgstr "Registrieren"
#: actions/register.php:142
msgid "Registration not allowed."
-msgstr "Registrierung nicht erlaubt"
+msgstr "Registrierung nicht erlaubt."
#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
@@ -3567,7 +3701,7 @@ msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM-Adresse und "
+"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:583
@@ -3831,7 +3965,7 @@ msgstr "Organisation"
msgid "Description"
msgstr "Beschreibung"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistik"
@@ -3974,45 +4108,45 @@ msgstr "Pseudonyme"
msgid "Group actions"
msgstr "Gruppenaktionen"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Postausgang von %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Mitglieder"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Kein)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alle Mitglieder"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Erstellt"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4027,7 +4161,7 @@ msgstr ""
"und werde Teil der Gruppe und vielen anderen! ([Mehr Informationen](%%%%doc."
"help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4040,7 +4174,7 @@ msgstr ""
"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
"Nachrichten über ihr Leben und Interessen. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Admins"
@@ -5000,7 +5134,7 @@ msgid "Plugins"
msgstr "Erweiterungen"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Version"
@@ -5016,9 +5150,9 @@ msgstr "Zu Favoriten hinzufügen"
#. 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) hat deine Nachricht als Favorit gespeichert"
+msgstr "%1$s markierte Nachricht %2$s als Favorit."
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:142
@@ -5083,7 +5217,7 @@ msgstr "Konnte Gruppe nicht verlassen"
#: classes/Group_member.php:76
#, php-format
msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "Profil-ID %s ist ungültig."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
@@ -5202,9 +5336,9 @@ msgstr "Problem bei Speichern der Nachricht."
#. 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:1120
-#, fuzzy, php-format
+#, php-format
msgid "Could not save reply for %1$d, %2$d."
-msgstr "Konnte die lokale Gruppen Information nicht speichern."
+msgstr "Konnte Antwort auf %1$d, %2$d nicht speichern."
#. 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.
@@ -5242,7 +5376,7 @@ msgid "Unable to save tag."
msgstr "Konnte Seitenbenachrichtigung nicht speichern."
#. 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 "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
@@ -5285,9 +5419,9 @@ msgstr "Folgen"
#. 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 ist der Gruppe „%2$s“ beigetreten."
+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.
@@ -5363,185 +5497,185 @@ msgid "Untitled page"
msgstr "Seite ohne Titel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Hauptnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Eigene"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Zum Dienst verbinden"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Verbinden"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Seiteneinstellung ändern"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Einladen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Abmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Neues Benutzerkonto erstellen"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrieren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Anmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Hilfe"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Suchen"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Seitennachricht"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokale Ansichten"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Neue Nachricht"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Unternavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Hilfe"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Über"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "AGB"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privatsphäre"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Quellcode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Plakette"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
@@ -5549,7 +5683,7 @@ msgstr "StatusNet-Software-Lizenz"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5559,7 +5693,7 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -5568,7 +5702,7 @@ msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5580,20 +5714,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5601,7 +5735,7 @@ msgstr ""
"vorbehalten."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -5609,25 +5743,25 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Seitenerstellung"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Später"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Vorher"
@@ -5748,33 +5882,33 @@ msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
#: lib/apiauth.php:175
msgid "No application for that consumer key."
-msgstr ""
+msgstr "Kein Programm mit diesem Anwender-Schlüssel."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Schlechter Zugangstoken."
#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
#: lib/apiauth.php:217
msgid "No user for that token."
-msgstr ""
+msgstr "Kein Benutzer mit diesem Token."
#. 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
msgid "Could not authenticate you."
-msgstr ""
+msgstr "Konnte dich nicht authentifizieren."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Versuchte, unbekanntes Token ungültig zu machen."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Konnte ungültig gemachtes Token nicht löschen."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5857,11 +5991,6 @@ msgstr ""
"Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/"
"Schreibzugriff"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Abbrechen"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5886,12 +6015,7 @@ msgstr "Widerrufen"
#: lib/atom10feed.php:112
msgid "author element must contain a name element."
-msgstr ""
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Anhänge"
+msgstr "Das „author“-Element muss ein „name“-Element erhaten."
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
@@ -6355,14 +6479,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Aktualisierungen via SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Verbindungen"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Programme mit Zugriffserlaubnis"
@@ -7072,7 +7196,7 @@ msgstr "Nachricht senden"
#: lib/noticeform.php:174
#, php-format
msgid "What's up, %s?"
-msgstr "Was ist los, %s?"
+msgstr "Was geht, %s?"
#: lib/noticeform.php:193
msgid "Attach"
@@ -7163,24 +7287,24 @@ msgstr "Stups"
msgid "Send a nudge to this user"
msgstr "Sende diesem Benutzer einen Stups"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Neues Profil konnte nicht angelegt werden."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Fehler beim Einfügen des Avatars."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Fehler beim Einfügen des entfernten Profils."
#. 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 "Doppelte Nachricht."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Konnte neues Abonnement nicht eintragen."
@@ -7215,7 +7339,7 @@ msgstr "Deine gesendeten Nachrichten"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr "Stichworte in %ss Nachrichten"
+msgstr "Stichworte in den Nachrichten von %s"
#. TRANS: Displayed as version information for a plugin if no version information was found.
#: lib/plugin.php:121
@@ -7482,9 +7606,9 @@ msgstr "Abbestellen"
#. 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
-#, fuzzy, php-format
+#, php-format
msgid "User %1$s (%2$d) has no profile record."
-msgstr "Benutzer hat kein Profil."
+msgstr "Benutzer %1$s (%2$d) hat kein Profil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -7533,17 +7657,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7551,12 +7675,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7564,12 +7688,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7577,12 +7701,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7590,7 +7714,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:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -7607,7 +7731,7 @@ msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
#: scripts/restoreuser.php:82
#, php-format
msgid "Backup file for user %s (%s)"
-msgstr ""
+msgstr "Backup-Datei des Benutzers %s (%s)"
#: scripts/restoreuser.php:88
msgid "No user specified; using backup user."
@@ -7616,4 +7740,4 @@ msgstr "Keine Benutzer-ID angegeben"
#: scripts/restoreuser.php:94
#, php-format
msgid "%d entries in backup."
-msgstr ""
+msgstr "%d Einträge im Backup."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index ab2386b19..88421ca45 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
# Author: Brion
# Author: Bruce89
# Author: CiaranG
+# Author: Lcawte
# Author: Reedy
# --
# This file is distributed under the same license as the StatusNet package.
@@ -12,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:28+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:36+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +94,15 @@ msgstr "Save"
msgid "No such page."
msgstr "No such page."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +203,13 @@ msgstr "You and friends"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates from %1$s and friends on %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +236,7 @@ msgstr "API method not found."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -311,43 +314,60 @@ msgstr "Block user failed."
msgid "Unblock user failed."
msgstr "Unblock user failed."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direct messages from %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "All the direct messages sent from %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direct messages to %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "All the direct messages sent to %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "No message text!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "That's too long. Max message size is %d chars."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "That's too long. Max message size is %d chars."
+msgstr[1] "That's too long. Max message size is %d chars."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Recipient user not found."
-#: 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 "Can't send direct messages to users who aren't your friend."
+#. 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 ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -524,19 +544,24 @@ msgid "groups on %s"
msgstr "groups on %s"
#: actions/apimediaupload.php:100
-#, fuzzy
msgid "Upload failed."
-msgstr "Upload file"
+msgstr "Upload failed."
+
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Invalid login token specified."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "No oauth_token parameter provided."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Invalid token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -554,36 +579,22 @@ msgstr "Invalid token."
msgid "There was a problem with your session token. Try again, please."
msgstr "There was a problem with your session token. Try again, please."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Invalid nickname / password!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Database error deleting OAuth application user."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Database error inserting OAuth application user."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"The request token %s has been authorised. Please exchange it for an access "
-"token."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "The request token %s has been denied and revoked."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -592,15 +603,15 @@ msgstr "The request token %s has been denied and revoked."
msgid "Unexpected form submission."
msgstr "Unexpected form submission."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "An application would like to connect to your account"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Allow or deny access"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -612,11 +623,11 @@ msgstr ""
"give access to your %4$s account to third parties you trust."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -625,23 +636,47 @@ msgid "Nickname"
msgstr "Nickname"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Deny"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancel"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Allow"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM confirmation cancelled."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "The request token %s has been denied and revoked."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "You are not authorised."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "This method requires a POST or DELETE."
@@ -802,7 +837,8 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Delete"
@@ -858,12 +894,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -876,12 +913,13 @@ msgstr "Do not block this user"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
@@ -896,9 +934,12 @@ msgstr "Block this user"
msgid "Failed to save block information."
msgstr "Failed to save block information."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1024,7 +1065,7 @@ msgstr "You are not the owner of this application."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1052,6 +1093,67 @@ msgstr "Do not delete this application"
msgid "Delete this application"
msgstr "Delete this application"
+#. 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 "You must be logged in to leave a group."
+
+#. 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 "No nickname or 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 "You are not a member of this group."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Could not update group."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s left group %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Delete user"
+
+#: 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 ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Do not delete this notice"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Delete this user"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1128,54 +1230,63 @@ msgstr "Design"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "nvalid logo URL."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "nvalid logo URL."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Theme not available: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Change logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Site logo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Change theme"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Site theme"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Theme for the site."
-#: actions/designadminpanel.php:480
-#, fuzzy
+#: actions/designadminpanel.php:490
msgid "Custom theme"
-msgstr "Site theme"
+msgstr "Custom theme"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Change background image"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1185,66 +1296,66 @@ msgstr ""
"$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Turn background image on or off."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tile background image"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Change colours"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Content"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidebar"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Use defaults"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restore default designs"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reset back to default"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1254,7 +1365,7 @@ msgstr "Reset back to default"
msgid "Save"
msgstr "Save"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Save design"
@@ -1725,7 +1836,7 @@ msgstr "Couldn't convert request tokens to access tokens."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Remote service uses unknown version of OMB protocol."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Error updating remote profile."
@@ -2170,9 +2281,8 @@ msgid "This is your inbox, which lists your incoming private messages."
msgstr "This is your inbox, which lists your incoming private messages."
#: actions/invite.php:39
-#, fuzzy
msgid "Invites have been disabled."
-msgstr "Invitations enabled"
+msgstr "Invites have been disabled."
#: actions/invite.php:41
#, php-format
@@ -2317,10 +2427,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "You must be logged in to join a group."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "No nickname or ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2562,6 +2668,11 @@ msgstr "You can't send a message to this user."
msgid "No content!"
msgstr "No content!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "That's too long. Max message size is %d chars."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "No recipient specified."
@@ -2722,7 +2833,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2759,9 +2870,8 @@ msgid "View profile designs"
msgstr "View profile designs"
#: actions/othersettings.php:123
-#, fuzzy
msgid "Show or hide profile designs."
-msgstr "View profile designs"
+msgstr "Show or hide profile designs."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2871,155 +2981,166 @@ msgstr ""
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Theme directory not readable: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Avatar directory not writable: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Background directory not writable: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Locales directory not readable: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Site path"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Theme directory"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
+#: actions/pathsadminpanel.php:265
#, fuzzy
-msgid "Theme server"
+msgid "Server for themes"
+msgstr "Theme for the site."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
msgstr "SSL server"
-#: actions/pathsadminpanel.php:268
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
#, fuzzy
-msgid "Theme path"
+msgid "SSL path"
msgstr "Site path"
-#: actions/pathsadminpanel.php:272
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
#, fuzzy
-msgid "Theme directory"
-msgstr "Avatar directory"
+msgid "Directory"
+msgstr "Theme directory"
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar server"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avatar path"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatar directory"
-#: actions/pathsadminpanel.php:301
-#, fuzzy
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
-msgstr "Background"
+msgstr "Backgrounds"
-#: actions/pathsadminpanel.php:305
-#, fuzzy
-msgid "Background server"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:313
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
#, fuzzy
-msgid "Background directory"
-msgstr "Background directory not writable: %s."
+msgid "Attachments"
+msgstr "No attachments."
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Never"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Sometimes"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
-#, fuzzy
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
-msgstr "SSL"
+msgstr "Use SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Save paths"
@@ -3221,24 +3342,24 @@ msgid "Public Stream Feed (Atom)"
msgstr "Public Stream Feed (Atom)"
#: actions/public.php:188
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-"This is the timeline for %s and friends but no one has posted anything yet."
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
#: actions/public.php:191
msgid "Be the first to post!"
msgstr ""
#: actions/public.php:195
-#, fuzzy, php-format
+#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
+"Why not [register an account](%%action.register%%) and be the first to post!"
#: actions/public.php:242
#, php-format
@@ -3283,13 +3404,13 @@ msgid "Be the first to post one!"
msgstr ""
#: actions/publictagcloud.php:75
-#, fuzzy, php-format
+#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
@@ -3336,9 +3457,8 @@ msgid "You have been identified. Enter a new password below. "
msgstr ""
#: actions/recoverpassword.php:188
-#, fuzzy
msgid "Password recovery"
-msgstr "Password recovery requested"
+msgstr "Password recovery"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
@@ -3773,7 +3893,7 @@ msgstr "Organization"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistics"
@@ -3915,45 +4035,45 @@ msgstr ""
msgid "Group actions"
msgstr "Group actions"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Notice feed for %s group (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Notice feed for %s group (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Notice feed for %s group (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Outbox for %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Members"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(None)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Created"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3968,7 +4088,7 @@ msgstr ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3981,7 +4101,7 @@ msgstr ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Admins"
@@ -4924,7 +5044,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Version"
@@ -5158,7 +5278,7 @@ msgid "Unable to save tag."
msgstr "Unable to save site notice."
#. 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 "You have been banned from subscribing."
@@ -5280,185 +5400,185 @@ msgid "Untitled page"
msgstr "Untitled page"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Primary site navigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Change your email, avatar, password, profile"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connect to services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Connect"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Change site configuration"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Invite"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logout from the site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Logout"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Create an account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Register"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Login"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Search"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Site notice"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Local views"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Page notice"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "F.A.Q."
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contact"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet software licence"
@@ -5466,7 +5586,7 @@ msgstr "StatusNet software licence"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5476,7 +5596,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is a microblogging service."
@@ -5485,7 +5605,7 @@ msgstr "**%%site.name%%** is a microblogging service."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5497,50 +5617,50 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Site content license"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "All %1$s content and data are available under the %2$s licence."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "After"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Before"
@@ -5680,12 +5800,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5770,11 +5890,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancel"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5801,12 +5916,6 @@ msgstr "Revoke"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-#, fuzzy
-msgid "Attachments"
-msgstr "No attachments."
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
#, fuzzy
@@ -6268,14 +6377,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Updates by SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connections"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Authorised connected applications"
@@ -6981,24 +7090,24 @@ msgstr "Nudge"
msgid "Send a nudge to this user"
msgstr "Send a nudge to this user"
-#: lib/oauthstore.php:283
+#: 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 "Couldn't insert new subscription."
@@ -7353,17 +7462,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7371,12 +7480,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7384,12 +7493,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7397,12 +7506,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7410,7 +7519,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 e69920f84..fcdeedfeb 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:29+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:37+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -95,14 +95,15 @@ msgstr "Konservu"
msgid "No such page."
msgstr "Ne estas tiu paĝo."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -203,12 +204,13 @@ msgstr "Vi kaj amikoj"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -235,7 +237,7 @@ msgstr "Metodo de API ne troviĝas."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -311,43 +313,59 @@ msgstr "Ne sukcesis bloki uzanton."
msgid "Unblock user failed."
msgstr "Ne sukcesis malbloki uzanton."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Rektaj mesaĝoj de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Ĉiuj rektaj mesaĝoj senditaj de %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Rektaj mesaĝoj al %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Ĉiuj rektaj mesaĝoj senditaj al %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Sen mesaĝteksto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Tro longas. Mesaĝa longlimo estas %d signoj."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Tro longas. Mesaĝa longlimo estas %d signoj."
+msgstr[1] "Tro longas. Mesaĝa longlimo estas %d signoj."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Ricevonta uzanto ne troviĝas."
-#: 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 "Vi ne povas sendi rektan mesaĝon al uzanto kiu ne estas via amiko."
+#. 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 "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -528,15 +546,21 @@ msgstr "grupoj ĉe %s"
msgid "Upload failed."
msgstr "Malsukcesis alŝuti"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Specifita ensalutado-ĵetono nevalidas."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Ne oauth_token parametro provizita."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Nevalida ĵetono"
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -554,36 +578,22 @@ msgstr "Nevalida ĵetono"
msgid "There was a problem with your session token. Try again, please."
msgstr "Estis problemo pri via seanco. Bonvolu provi refoje."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nevalida kromnomo / pasvorto!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Datumbaza eraro forigi la uzanton de *OAuth-aplikaĵo."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"La demanda ĵetono %s estis rajtigita. Bonvolu interŝanĝi ĝin por atinga "
-"ĵetono."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "La demanda token %s estis neita kaj revokita."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -592,15 +602,15 @@ msgstr "La demanda token %s estis neita kaj revokita."
msgid "Unexpected form submission."
msgstr "Neatendita formo-sendo."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Aplikaĵo volas konekti al via konto"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permesi aŭ malpermesi atingon"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -612,11 +622,11 @@ msgstr ""
"via %4$s konto al triaj partioj, kiujn vi fidas."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -625,23 +635,47 @@ msgid "Nickname"
msgstr "Kromnomo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Pasvorto"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Malpermesi"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Nuligi"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permesi"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permesi aŭ malpermesi atingon al via kontdatumo."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Tujmesaĝila konfirmo nuligita."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "La demanda token %s estis neita kaj revokita."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Vi ne estas rajtigita."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ĉi tiu metodo bezonas POST aǔ DELETE."
@@ -802,7 +836,8 @@ msgid "Preview"
msgstr "Antaŭrigardo"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Forigi"
@@ -857,12 +892,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ne"
@@ -875,12 +911,13 @@ msgstr "Ne bloki la uzanton"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Jes"
@@ -895,9 +932,12 @@ msgstr "Bloki la uzanton"
msgid "Failed to save block information."
msgstr "Eraris konservi blokado-informon."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1023,7 +1063,7 @@ msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Problemo okazas pri via seancĵetono."
@@ -1050,6 +1090,67 @@ msgstr "Ne forigu ĉi tiun aplikaĵon."
msgid "Delete this application"
msgstr "Viŝi ĉi tiun aplikon"
+#. 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 "Ensalutu por eksaniĝi."
+
+#. 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 "Ne estas alinomo aŭ 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 "Vi ne estas grupano."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s eksaniĝis de grupo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Forigi uzanton"
+
+#: 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 ""
+"Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
+"datumbazo sen sekurkopio."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Ne forigi la avizon"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Forigi la uzanton"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1125,53 +1226,63 @@ msgstr "Aspekto"
msgid "Design settings for this StatusNet site"
msgstr "Desegna agordo por ĉi tiu StatusNet-retejo"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL por la emblemo nevalida."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL por la emblemo nevalida."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Desegno ne havebla: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Ŝanĝi emblemon"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Reteja emblemo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Reteja emblemo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Ŝanĝi desegnon"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Reteja desegno"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Desegno por la retejo"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Propra desegno"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Vi povas alŝuti propran StatusNet-desegnon kiel .zip-dosiero"
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Ŝanĝi fonbildon"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fono"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1179,66 +1290,66 @@ msgid ""
msgstr "Vi povas alŝuti fonbildon por la retejo. Dosiero-grandlimo estas %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "En"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "For"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Aktivigi aŭ senaktivigi fonbildon"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Ripeti la fonbildon"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Ŝanĝi kolorojn"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Enhavo"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Flanka strio"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Teksto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Ligiloj"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Speciala"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Propra CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Uzu defaŭlton"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaŭri defaŭltajn desegnojn"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Redefaŭltiĝi"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1248,7 +1359,7 @@ msgstr "Redefaŭltiĝi"
msgid "Save"
msgstr "Konservi"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Savi desegnon"
@@ -1718,7 +1829,7 @@ msgstr "Malsukcesis interŝanĝi petĵetonon al atingoĵetono."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Fora servo uzas nekonatan version de OMB-protokolo."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Eraro je ĝisdatigo de fora profilo."
@@ -2304,10 +2415,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Ensalutu por aniĝi al grupo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Ne estas alinomo aŭ ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2548,6 +2655,11 @@ msgstr "Vi ne povas sendi mesaĝon al la uzanto."
msgid "No content!"
msgstr "Neniu enhavo!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Tro longas. Mesaĝa longlimo estas %d signoj."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Neniu ricevonto speifiĝas."
@@ -2707,7 +2819,7 @@ msgstr "Bonvolu, nur %s-URL per plata HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Datumformato ne subteniĝas."
@@ -2856,147 +2968,166 @@ msgstr "Vojoj"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Desegno adresaro ne havebla: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Avatara adresaro ne skribebla: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Fona adresaro ne skribebla: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Lokaĵara adresaro ne havebla: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Nevalida SSL-servilo. La longlimo estas 225 literoj."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Retejo"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servilo"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Gastigserva Nomo de la retejo"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Vojo"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Reteja vojo"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Lokigilo al lokaĵaro"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Tema adresaro"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Adresara lokigilo al lokaĵaro"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Tajlora URL"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Ĉu uzi tajloran (pli facile legebla kaj memorebla) URL?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Temo"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Tema servilo"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Desegno por la retejo"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Temo-lokigilo"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "\"SSL\"a servilo"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Reteja vojo"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Tema adresaro"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Adresara lokigilo al lokaĵaro"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avataroj"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatara servilo"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avataro-lokigilo"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatara adresaro"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fono"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Fono-lokigilo"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Fono-lokigilo"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Fona adresaro"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Aldonaĵo"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "\"SSL\""
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Neniam"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Kelkfoje"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Ĉiam"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Uzi \"SSL\""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Kiam uzi \"SSL\""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "\"SSL\"a servilo"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servilo, kien orienti \"SSL\"-peton"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Konservu lokigilon"
@@ -3751,7 +3882,7 @@ msgstr "Organizaĵo"
msgid "Description"
msgstr "Priskribo"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistiko"
@@ -3891,45 +4022,45 @@ msgstr "Alnomo"
msgid "Group actions"
msgstr "Grupaj agoj"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Avizofluo de grupo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Avizofluo de grupo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Avizofluo de grupo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Foramiko de grupo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Grupanoj"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(nenio)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Ĉiuj grupanoj"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Kreita"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3943,7 +4074,7 @@ msgstr ""
"[StatusNet](http://status.net/). [Aniĝu](%%action.register%%) por fariĝi "
"parto de tiu ĉi grupo kaj multe pli! ([Pli](%%doc.help%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3956,7 +4087,7 @@ msgstr ""
"Molvaro [StatusNet](*http://*status.*net/), kie anoj konigas mesaĝetojn pri "
"siaj vivoj kaj ŝatokupoj. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administrantoj"
@@ -4890,7 +5021,7 @@ msgid "Plugins"
msgstr "Kromprogramo"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versio"
@@ -5122,7 +5253,7 @@ msgid "Unable to save tag."
msgstr "Malsukcesis konservi etikedon."
#. 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 "Vi esatas blokita de aboni."
@@ -5242,185 +5373,185 @@ msgid "Untitled page"
msgstr "Sentitola paĝo"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Unua reteja navigado"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Tempstrio pri vi kaj amikoj"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Persona"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Konekti al servoj"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Konekti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ŝanĝi agordojn de la retejo"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administri"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Inviti"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Elsaluti el la retejo"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr " Elsaluti"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Krei konton"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registriĝi"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ensaluti al la retejo"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Ensaluti"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Helpu min!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Helpo"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Serĉi homon aŭ tekston"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Serĉi"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Reteja anonco"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Loka vido"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Paĝa anonco"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Dua reteja navigado"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Helpo"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Enkonduko"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Oftaj demandoj"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Serva Kondiĉo"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privateco"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Fontkodo"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insigno"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licenco de la programaro StatusNet"
@@ -5428,7 +5559,7 @@ msgstr "Licenco de la programaro StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5438,7 +5569,7 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -5447,7 +5578,7 @@ msgstr "**%%site.name%%** estas mikrobloga servo."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5459,27 +5590,27 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Reteja enhava permesilo"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Enhavo kaj datumo de %1$s estas privata kaj konfidenca."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Enhava kaj datuma aŭtorrajto apartenas al %1$s. Ĉiuj rajtoj rezervitaj."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -5487,25 +5618,25 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Ĉiuj enhavo kaj datumo ĉe %1$s estas havebla sub permesilo %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paĝado"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Poste"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Antaŭe"
@@ -5645,12 +5776,12 @@ msgid "Could not authenticate you."
msgstr "Malsukcesis aŭtentigi vin."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Provis revoki nekonatan ĵetonon."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Malsukcesis forigi revokitan ĵetonon."
@@ -5733,11 +5864,6 @@ msgstr "Leg-skribe"
msgid "Default access for this application: read-only, or read-write"
msgstr "Defaŭta aliro por la aplikaĵo: nur-lege aŭ leg-skribe."
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Nuligi"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5764,11 +5890,6 @@ msgstr "Revoki"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Aldonaĵo"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6231,14 +6352,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Ĝisdatiĝo per SMM"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Konektoj"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Konektitaj aplikaĵoj rajtigitaj"
@@ -7036,24 +7157,24 @@ msgstr "Puŝeti"
msgid "Send a nudge to this user"
msgstr "Sendi puŝeton al la uzanto"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Eraris enmeti novan profilon"
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Eraris enmeti novan vizaĝbildon."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Eraris enmeti foran profilon."
#. 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 "Refoja avizo."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Eraris enmeti novan abonon."
@@ -7407,17 +7528,17 @@ msgid "Moderator"
msgstr "Moderanto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7425,12 +7546,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7438,12 +7559,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7451,12 +7572,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7464,7 +7585,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:1184
+#: lib/util.php:1194
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 26c96c266..2bdcc4eed 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:31+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:39+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -97,14 +97,15 @@ msgstr "Guardar"
msgid "No such page."
msgstr "No existe tal página."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -206,12 +207,13 @@ msgstr "Tú y tus amistades"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -238,7 +240,7 @@ msgstr "Método de API no encontrado."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -314,43 +316,59 @@ msgstr "Falló bloquear usuario."
msgid "Unblock user failed."
msgstr "Falló desbloquear usuario."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Mensajes directos de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Todos los mensajes directos enviados desde %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Mensajes directos a %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Todos los mensajes directos enviados a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "¡Sin texto de mensaje!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+msgstr[1] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "No se encuentra usuario receptor."
-#: 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 "No se puede enviar mensajes directos a usuarios que no son tu amigo."
+#. 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 "No te auto envíes un mensaje; dícetelo a ti mismo."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -532,15 +550,21 @@ msgstr "Grupos en %s"
msgid "Upload failed."
msgstr "Carga falló."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Token de acceso inválido especificado."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "No se ha provisto de un parámetro oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Token inválido."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -559,38 +583,24 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "¡Usuario o contraseña inválidos!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Error de la base de datos durante la eliminación del usuario de la "
"aplicación OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"El token de solicitud %s ha sido autorizado. Por favor, cámbialo por un "
-"token de acceso."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "El token de solicitud %2 ha sido denegado y revocado."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -599,15 +609,15 @@ msgstr "El token de solicitud %2 ha sido denegado y revocado."
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Una aplicación quisiera conectarse a tu cuenta"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permitir o denegar el acceso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -619,11 +629,11 @@ msgstr ""
"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Cuenta"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -632,23 +642,47 @@ msgid "Nickname"
msgstr "Usuario"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contraseña"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Denegar"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancelar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permitir"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permitir o denegar el acceso a la información de tu cuenta."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Confirmación de mensajería instantánea cancelada."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "El token de solicitud %2 ha sido denegado y revocado."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "No estás autorizado."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método requiere un PUBLICAR O ELIMINAR"
@@ -810,7 +844,8 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Borrar"
@@ -866,12 +901,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -884,12 +920,13 @@ msgstr "No bloquear a este usuario"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
@@ -904,9 +941,12 @@ msgstr "Bloquear este usuario."
msgid "Failed to save block information."
msgstr "No se guardó información de bloqueo."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1033,7 +1073,7 @@ msgstr "No eres el propietario de esta aplicación."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1061,6 +1101,67 @@ msgstr "No eliminar esta aplicación"
msgid "Delete this application"
msgstr "Borrar esta aplicación"
+#. 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 "Debes estar conectado para dejar un grupo."
+
+#. 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 "Ningún nombre de usuario o 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 "No eres miembro de este grupo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "No se pudo actualizar el grupo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ha dejado el grupo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Borrar usuario"
+
+#: 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 ""
+"¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
+"todos los datos sobre el usuario, sin dejar una copia de seguridad."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "No eliminar este mensaje"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Borrar este usuario"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1137,53 +1238,63 @@ msgstr "Diseño"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL de logotipo inválido."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL de logotipo inválido."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Cambiar logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo del sitio"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo del sitio"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Cambiar el tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema del sitio"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema para el sitio."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Personalizar tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Puedes subir un tema personalizado StatusNet como un archivo .ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar la imagen de fondo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1193,66 +1304,66 @@ msgstr ""
"es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Activar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivar"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o desactivar la imagen de fondo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imagen de fondo en mosaico"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contenido"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Personalizar CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar los valores predeterminados"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar los diseños predeterminados"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver a los valores predeterminados"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1262,7 +1373,7 @@ msgstr "Volver a los valores predeterminados"
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Guardar el diseño"
@@ -1738,7 +1849,7 @@ msgstr "No se pudo convertir el token de solicitud en token de acceso."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "El servicio remoto utiliza una versión desconocida del protocolo OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Error al actualizar el perfil remoto."
@@ -2336,10 +2447,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Debes estar conectado para unirte a un grupo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Ningún nombre de usuario o ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2585,6 +2692,11 @@ msgstr "No puedes enviar mensaje a este usuario."
msgid "No content!"
msgstr "¡Ningún contenido!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "No se especificó receptor."
@@ -2748,7 +2860,7 @@ msgstr "Solamente %s URL sobre HTTP simples, por favor."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "No es un formato de datos compatible."
@@ -2897,147 +3009,166 @@ msgstr "Rutas"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Directorio de temas ilegible: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Directorio de avatares no escribible: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Directorio de fondo no escribible: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Directorio de configuración regional ilegible: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Servidor SSL no válido. La longitud máxima es de 255 caracteres."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Sitio"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servidor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nombre del host del servidor del sitio."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Ruta"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Ruta del sitio"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Ruta de las configuraciones locales"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directorio de temas"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Ruta del directorio de las configuraciones locales"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URL agradables"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "¿Usar URL amigables (más legibles y memorizables)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servidor de los temas"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema para el sitio."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Ruta del tema"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servidor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Ruta del sitio"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directorio de temas"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Ruta del directorio de las configuraciones locales"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Imágenes"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servidor de la imagen"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Ruta de la imagen"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directorio de la imagen"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fondos"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servidor de fondo"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Ruta del fondo"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directorio del fondo"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Adjuntos"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "A veces"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Siempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Cuándo utilizar SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servidor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Guardar rutas"
@@ -3817,7 +3948,7 @@ msgstr "Organización"
msgid "Description"
msgstr "Descripción"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estadísticas"
@@ -3959,45 +4090,45 @@ msgstr "Alias"
msgid "Group actions"
msgstr "Acciones del grupo"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Canal de mensajes del grupo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Canal de mensajes del grupo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Canal de mensajes del grupo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Amistades de amistades del grupo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Miembros"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ninguno)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Todos los miembros"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Creado"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4013,7 +4144,7 @@ msgstr ""
"action.register%%%%) para formar parte de este y muchos más grupos! ([Más "
"información](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4026,7 +4157,7 @@ msgstr ""
"herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
"comparten mensajes cortos acerca de su vida e intereses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administradores"
@@ -4985,7 +5116,7 @@ msgid "Plugins"
msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versión"
@@ -5221,7 +5352,7 @@ msgid "Unable to save tag."
msgstr "Incapaz de grabar etiqueta."
#. 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 "Se te ha prohibido la suscripción."
@@ -5342,185 +5473,185 @@ msgid "Untitled page"
msgstr "Página sin título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea temporal de amistades"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectar a los servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar la configuración del sitio"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amistades y compañeros a unirse a tí en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Cerrar sesión en el sitio"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Cerrar sesión"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear una cuenta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar sesión en el sitio"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "¡Ayúdame!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Ayuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Mensaje de sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vistas locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Mensaje de página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Ayuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Preguntas Frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacidad"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Fuente"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Ponerse en contacto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
@@ -5528,7 +5659,7 @@ msgstr "Licencia de software de StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5538,7 +5669,7 @@ msgstr ""
"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -5547,7 +5678,7 @@ msgstr "**%%site.name%%** es un servicio de microblogueo."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5559,27 +5690,27 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "El contenido y datos de %1$s son privados y confidenciales."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -5587,7 +5718,7 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5595,19 +5726,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginación"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Después"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Antes"
@@ -5751,12 +5882,12 @@ msgid "Could not authenticate you."
msgstr "No ha sido posible autenticarte."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Se intentó revocar un token desconocido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "No se pudo eliminar el token revocado."
@@ -5840,11 +5971,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancelar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5871,11 +5997,6 @@ msgstr "Revocar"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Adjuntos"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6339,14 +6460,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Actualizaciones por sms"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Conecciones"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Aplicaciones conectadas autorizadas"
@@ -7151,24 +7272,24 @@ msgstr "Dar un toque a "
msgid "Send a nudge to this user"
msgstr "Dar un toque a este usuario"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Error al insertar un nuevo perfil."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Error al insertar el avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Error al insertar el perfil remoto."
#. 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 "Mensaje duplicado."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "No se pudo insertar una nueva suscripción."
@@ -7524,17 +7645,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7542,12 +7663,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7555,12 +7676,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7568,12 +7689,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7581,7 +7702,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:1184
+#: lib/util.php:1194
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 ecfa7c756..f6d244e12 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:32+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:40+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
"MIME-Version: 1.0\n"
@@ -23,9 +23,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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2010-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -96,14 +96,15 @@ msgstr "ذخیره"
msgid "No such page."
msgstr "چنین صفحه‌ای وجود ندارد."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -203,12 +204,13 @@ msgstr "شما و دوستان"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "به روز رسانی از %1$s و دوستان در %2$s"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -235,7 +237,7 @@ msgstr "رابط مورد نظر پیدا نشد."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,43 +311,58 @@ msgstr "مسدود کردن کاربر شکست خورد."
msgid "Unblock user failed."
msgstr "باز کردن کاربر ناموفق بود."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "پیام‌های مستقیم از %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "تمام پیام‌های مستقیم فرستاده‌شده از %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "پیام‌های مستقیم به %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "تمام پیام‌های مستقیم فرستاده‌شده به %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "هیچ پیام متنی وجود ندارد!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d نویسه است."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 نویسه است."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "کاربر گیرنده یافت نشد."
-#: 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 "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد."
+#. 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 "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -526,15 +543,21 @@ msgstr "گروه‌ها در %s"
msgid "Upload failed."
msgstr "بارگذاری شکست خورد."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "رمز ورود مشخص شده نامعتبر است."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "هیچ پارامتر oauth_token آماده نشده است."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "رمز نامعتبر است."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -552,35 +575,22 @@ msgstr "رمز نامعتبر است."
msgid "There was a problem with your session token. Try again, please."
msgstr "مشکلی در دریافت نشست شما وجود دارد. لطفا بعدا سعی کنید."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "نام کاربری یا گذرواژه نامعتبر است!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "هنگام حذف‌کردن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"نشانهٔ درخواست %s تایید شد. لطفا آن را برای یک نشانهٔ دسترسی مبادله کنید."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "نشانهٔ درخواست %s پذیرفته نشد و لغو شد."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -589,15 +599,15 @@ msgstr "نشانهٔ درخواست %s پذیرفته نشد و لغو شد."
msgid "Unexpected form submission."
msgstr "ارسال غیر قابل انتظار فرم."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "یک برنامه می‌خواهد که به حساب شما وصل شود"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "اجازه‌دادن (به) یا جلوگیری از دسترسی"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -610,11 +620,11 @@ msgstr ""
"بدهید."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "حساب کاربری"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -623,23 +633,47 @@ msgid "Nickname"
msgstr "نام کاربری"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "گذرواژه"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "رد کردن"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "انصراف"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "اجازه دادن"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "به دسترسی به اطلاعات حسابتان اجازه بدهید یا از آن جلوگیری کنید."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "تایید پیام‌رسان فوری لغو شد."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "نشانهٔ درخواست %s پذیرفته نشد و لغو شد."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "شما شناسایی نشده اید."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "این روش نیازمند POST یا DELETE است."
@@ -801,7 +835,8 @@ msgid "Preview"
msgstr "پیش‌نمایش"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "حذف"
@@ -859,12 +894,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "خیر"
@@ -877,12 +913,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "بله"
@@ -897,9 +934,12 @@ msgstr "کاربر را مسدود کن"
msgid "Failed to save block information."
msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1025,7 +1065,7 @@ msgstr "شما مالک این برنامه نیستید."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "یک مشکل با رمز نشست شما وجود داشت."
@@ -1053,6 +1093,67 @@ msgstr "این برنامه حذف نشود"
msgid "Delete this application"
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 "برای ترک یک گروه، شما باید وارد شده باشید."
+
+#. 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 "نام‌مستعار یا شناسه‌ای وجود ندارد."
+
+#. 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 "شما یک عضو این گروه نیستید."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s گروه %2$s را ترک کرد"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "حذف کاربر"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "این پیام را پاک نکن"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "حذف این کاربر"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1129,55 +1230,65 @@ msgstr "طرح"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "نشانی اینترنتی نشان نامعتبر است."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "نشانی اینترنتی نشان نامعتبر است."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "پوسته در دسترس نیست: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "تغییر نشان"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "نشان وب‌گاه"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "نشان وب‌گاه"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "تغییر پوسته"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "پوستهٔ وب‌گاه"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "پوسته برای وب‌گاه"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "پوستهٔ اختصاصی"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"شما می‌توانید یک پوستهٔ اختصاصی StatusNet را به‌عنوان یک آرشیو .ZIP بارگذاری "
"کنید."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغییر تصویر پیش‌زمینه"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "پیش‌زمینه"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1187,66 +1298,66 @@ msgstr ""
"پرونده %1 $s است."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "روشن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "خاموش"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "تصویر پیش‌زمینه را فعال یا غیرفعال کنید."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "تصویر پیش‌زمینهٔ موزاییکی"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغییر رنگ‌ها"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "محتوا"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "ستون کناری"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "متن"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "پیوندها"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "پیشرفته"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS اختصاصی"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استفاده‌کردن از پیش‌فرض‌ها"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "بازگرداندن طرح‌های پیش‌فرض"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1256,7 +1367,7 @@ msgstr "برگشت به حالت پیش گزیده"
msgid "Save"
msgstr "ذخیره‌کردن"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "ذخیره‌کردن طرح"
@@ -1733,7 +1844,7 @@ msgstr "نمی‌توان نشانهٔ درخواست شما را به نشان
msgid "Remote service uses unknown version of OMB protocol."
msgstr "خدمات مورد نظر از نسخهٔ نامفهومی از قرارداد OMB استفاده می‌کند."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
@@ -2320,10 +2431,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "نام‌مستعار یا شناسه‌ای وجود ندارد."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2565,6 +2672,11 @@ msgstr "شما نمی توانید به این کاربر پیام بفرستی
msgid "No content!"
msgstr "محتوایی وحود ندارد!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "این بسیار طولانی است. بیشینهٔ اندازهٔ پیام %d نویسه است."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "هیچ گیرنده ای مشخص نشده"
@@ -2725,7 +2837,7 @@ msgstr "لطفا تنها از نشانی‌های اینترنتی %s از را
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -2875,147 +2987,166 @@ msgstr "مسیر ها"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "شاخهٔ پوسته‌ها قابل خواندن نیست: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "شاخهٔ تصویر چهره‌ها قابل نوشتن نیست: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "شاخهٔ پس زمینه‌ها قابل نوشتن نیست: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "پوشهٔ تنظیمات محلی قابل خواندن نیست: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "کارگزار SSL نامعتبر است. بیشینهٔ طول نام ۲۵۵ نویسه است."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "وب‌گاه"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "کارگزار"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "نام میزبان کارگزار وب‌گاه."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "مسیر"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "مسیر وب‌گاه"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "نشانی تنظیمات محلی"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "شاخهٔ پوسته"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "مسیر پوشه برای زبان‌های محلی"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "نشانی‌های تمیز"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "از نشانی‌های تمیز (خواناتر و ماندگارتر در ذهن) استفاده شود؟"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "پوسته"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "کارگزار پوسته"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "پوسته برای وب‌گاه"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "مسیر پوسته"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "کارگزار SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "مسیر وب‌گاه"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "شاخهٔ پوسته"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "مسیر پوشه برای زبان‌های محلی"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "چهره‌ها"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "کارگزار چهره‌ها"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "مسیر نیم‌رخ"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "شاخهٔ نیم‌رخ"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "پس زمینه‌ها"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "کارگذار تصاویر پیش‌زمینه"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "مسیر تصاویر پیش‌زمینه"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "شاخهٔ تصاویر پیش‌زمینه"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "ضمائم"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "هیچ وقت"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "گاهی اوقات"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "برای همیشه"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "استفاده از SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "زمان استفاده از SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "کارگزار SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "کارگزار برای هدایت درخواست‌های SSL به"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "نشانی ذخیره سازی"
@@ -3776,7 +3907,7 @@ msgstr "سازمان"
msgid "Description"
msgstr "توصیف"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "آمار"
@@ -3918,45 +4049,45 @@ msgstr "نام های مستعار"
msgid "Group actions"
msgstr "اعمال گروه"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "خوراک پیام برای گروه %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "خوراک پیام برای گروه %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "خوراک پیام برای گروه %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF برای گروه %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "اعضا"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "همهٔ اعضا"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "ساخته شد"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3972,7 +4103,7 @@ msgstr ""
"می‌گذارند. [اکنون بپیوندید ](%%%%action.register%%%%) تا یکی از اعضای این "
"گروه و بلکه بیش‌تر بشوید! ([بیش‌تر بخوانید](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3986,7 +4117,7 @@ msgstr ""
"است. کاربران آن پیام‌های کوتاهی را دربارهٔ زندگی و علاقه‌مندی‌هایشان به اشتراک "
"می‌گذارند. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "مدیران"
@@ -4931,7 +5062,7 @@ msgid "Plugins"
msgstr "افزونه‌ها"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "نسخه"
@@ -5171,7 +5302,7 @@ msgid "Unable to save tag."
msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
#. 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 "شما از اشتراک منع شده‌اید."
@@ -5292,185 +5423,185 @@ msgid "Untitled page"
msgstr "صفحهٔ بدون عنوان"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "مسیریابی اصلی وب‌گاه"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "شخصی"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "وصل‌شدن"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "مدیر"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "دعوت‌کردن"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "خارج‌شدن از وب‌گاه"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "خروج"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ساختن یک جساب‌کاربری"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "ثبت‌نام"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "ورود"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "کمک"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "جست‌وجو برای افراد یا متن"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "جست‌وجو"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "پیام وب‌گاه"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "دید محلی"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "پیام صفحه"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "مسیریابی فرعی وب‌گاه"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "کمک"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "دربارهٔ"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "سوال‌های رایج"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "شرایط سرویس"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "خصوصی"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "منبع"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "تماس"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "نشان"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم افزار"
@@ -5478,7 +5609,7 @@ msgstr "StatusNet مجوز نرم افزار"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5488,7 +5619,7 @@ msgstr ""
"broughtbyurl%%) برای شما راه‌اندازی شده است."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -5497,7 +5628,7 @@ msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5509,50 +5640,50 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html) در دسترس است."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "حق تکثیر محتوا و داده‌ها با %1$s است. تمام حقوق محفوظ است."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "صفحه بندى"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "قبل از"
@@ -5695,12 +5826,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5782,11 +5913,6 @@ msgstr "خواندن-نوشتن"
msgid "Default access for this application: read-only, or read-write"
msgstr "دسترسی پیش‌فرض برای این برنامه: تنها خواندنی یا خواندن-نوشتن"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "انصراف"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5813,11 +5939,6 @@ msgstr "لغو کردن"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "ضمائم"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6282,14 +6403,14 @@ msgstr "پیامک"
msgid "Updates by SMS"
msgstr "به‌روزرسانی با پیامک"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "اتصال‌ها"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "برنامه‌های وصل‌شدهٔ مجاز"
@@ -7083,24 +7204,24 @@ msgstr "یادآوری‌کردن"
msgid "Send a nudge to this user"
msgstr "یک یادآوری به این کاربر فرستاده شود"
-#: lib/oauthstore.php:283
+#: 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 "نمی‌توان اشتراک تازه‌ای افزود."
@@ -7457,60 +7578,60 @@ msgid "Moderator"
msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, 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:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, 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:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, 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:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index f239374ca..0cc1858b7 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:33+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:41+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -101,14 +101,15 @@ msgstr "Tallenna"
msgid "No such page."
msgstr "Sivua ei ole."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -208,12 +209,13 @@ msgstr "Sinä ja kaverisi"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -240,7 +242,7 @@ msgstr "API-metodia ei löytynyt."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -313,45 +315,61 @@ msgstr "Käyttäjän esto epäonnistui."
msgid "Unblock user failed."
msgstr "Käyttäjän eston poisto epäonnistui."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Suorat viestit käyttäjälle %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Kaikki suorat viestit käytäjältä %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Suorat viestit käyttäjälle %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Kaikki suorat viestit käyttäjälle %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Viestissä ei ole tekstiä!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
+msgstr[1] "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Vastaanottajaa ei löytynyt."
-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144
#, fuzzy
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
+#. 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 "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -536,16 +554,21 @@ msgstr "Ryhmän toiminnot"
msgid "Upload failed."
msgstr "Komento epäonnistui"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Päivityksen sisältö ei kelpaa"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "Koko ei kelpaa."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -565,37 +588,25 @@ msgstr ""
"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
"uudelleen."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "Käyttäjätunnus tai salasana ei kelpaa."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Virhe tapahtui käyttäjän asettamisessa."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -604,15 +615,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Odottamaton lomakkeen lähetys."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -621,11 +632,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Käyttäjätili"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -634,23 +645,45 @@ msgid "Nickname"
msgstr "Tunnus"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Salasana"
-#: actions/apioauthauthorize.php:328
-#, fuzzy
-msgid "Deny"
-msgstr "Ulkoasu"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Peruuta"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
#, fuzzy
msgid "Allow"
msgstr "Kaikki"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Varmistuskoodia ei ole annettu."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Sinulla ei ole valtuutusta tähän."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -815,7 +848,8 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Poista"
@@ -869,12 +903,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Huomaa"
@@ -887,12 +922,13 @@ msgstr "Älä estä tätä käyttäjää"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -908,9 +944,12 @@ msgstr "Estä tämä käyttäjä"
msgid "Failed to save block information."
msgstr "Käyttäjän estotiedon tallennus epäonnistui."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1037,7 +1076,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1065,6 +1104,65 @@ msgstr "Älä poista tätä päivitystä"
msgid "Delete this application"
msgstr "Poista tämä päivitys"
+#. 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 "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
+
+#. 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 "Tunnusta ei ole."
+
+#. 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 "Sinä et kuulu tähän ryhmään."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Ei voitu päivittää ryhmää."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "Käyttäjän %1$s päivitys %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Poista käyttäjä"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Älä poista tätä päivitystä"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Poista käyttäjä"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1139,58 +1237,68 @@ msgstr "Ulkoasu"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
#, fuzzy
msgid "Invalid logo URL."
msgstr "Koko ei kelpaa."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Koko ei kelpaa."
+
+#: actions/designadminpanel.php:341
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Palvelun ilmoitus"
+
+#: actions/designadminpanel.php:466
#, fuzzy
msgid "Change theme"
msgstr "Vaihda"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
#, fuzzy
msgid "Site theme"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
#, fuzzy
msgid "Theme for the site."
msgstr "Kirjaudu ulos palvelusta"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tausta"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1198,71 +1306,71 @@ msgid ""
msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
#, fuzzy
msgid "Turn background image on or off."
msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Sisältö"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Haku"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Teksti"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Linkit"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Käytä oletusasetuksia"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
#, fuzzy
msgid "Restore default designs"
msgstr "Käytä oletusasetuksia"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
#, fuzzy
msgid "Reset back to default"
msgstr "Käytä oletusasetuksia"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1272,7 +1380,7 @@ msgstr "Käytä oletusasetuksia"
msgid "Save"
msgstr "Tallenna"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
#, fuzzy
msgid "Save design"
msgstr "Ryhmän ulkoasu"
@@ -1764,7 +1872,7 @@ msgstr "Ei saatu request tokenia."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Tuntematon OMB-protokollan versio."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
@@ -2354,11 +2462,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Tunnusta ei ole."
-
#: actions/joingroup.php:141
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
@@ -2610,6 +2713,11 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle."
msgid "No content!"
msgstr "Ei sisältöä!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Vastaanottajaa ei ole määritelty."
@@ -2774,7 +2882,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2926,159 +3034,178 @@ msgstr "Polut"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, fuzzy, php-format
msgid "Avatar directory not writable: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Taustakuvan hakemisto"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Pikaviestin ei ole käytettävissä."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
#, fuzzy
msgid "Site"
msgstr "Kutsu"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
#, fuzzy
msgid "Server"
msgstr "Palauta"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
#, fuzzy
msgid "Path"
msgstr "Polut"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
#, fuzzy
msgid "Site path"
msgstr "Palvelun ilmoitus"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Taustakuvan hakemisto"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Kirjaudu ulos palvelusta"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+#, fuzzy
+msgid "SSL server"
+msgstr "Palauta"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Palvelun ilmoitus"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Taustakuvan hakemisto"
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatars"
msgstr "Kuva"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
#, fuzzy
msgid "Avatar server"
msgstr "Profiilikuva-asetukset"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "Kuva päivitetty."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Taustakuvan hakemisto"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Taustakuvat"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Taustakuvapalvelin"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Taustakuvan hakemistopolku"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Taustakuvan hakemisto"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+#, fuzzy
+msgid "Attachments"
+msgstr "Liitettä ei ole."
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
#, fuzzy
msgid "Never"
msgstr "Palauta"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
#, fuzzy
msgid "Sometimes"
msgstr "Päivitykset"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
#, fuzzy
msgid "Always"
msgstr "Aliakset"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Palauta"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Palvelun ilmoitus"
@@ -3861,7 +3988,7 @@ msgstr "Sivutus"
msgid "Description"
msgstr "Kuvaus"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Tilastot"
@@ -3995,46 +4122,46 @@ msgstr "Aliakset"
msgid "Group actions"
msgstr "Ryhmän toiminnot"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Syöte ryhmän %s päivityksille (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Käyttäjän %s lähetetyt viestit"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Jäsenet"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
msgstr "(Tyhjä)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Kaikki jäsenet"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Luotu"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4044,7 +4171,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4055,7 +4182,7 @@ msgstr ""
"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Ylläpitäjät"
@@ -5008,7 +5135,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
#, fuzzy
msgid "Version"
msgstr "Omat"
@@ -5250,7 +5377,7 @@ msgid "Unable to save tag."
msgstr "Tagien tallennus epäonnistui."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
@@ -5375,44 +5502,44 @@ msgid "Untitled page"
msgstr "Nimetön sivu"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Omat"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Vaihda salasanasi"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Yhdistä"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
@@ -5420,82 +5547,82 @@ msgstr "Ensisijainen sivunavigointi"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Ylläpito"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Kutsu"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Kirjaudu sisään"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Kirjaudu ulos"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Luo uusi ryhmä"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rekisteröidy"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Kirjaudu sisään"
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Kirjaudu sisään"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ohjeet"
-#: lib/action.php:509
+#: lib/action.php:537
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Hae lisää ryhmiä"
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5503,68 +5630,68 @@ msgstr "Haku"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Palvelun ilmoitus"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Paikalliset näkymät"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Sivuilmoitus"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Ohjeet"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Tietoa"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "UKK"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Yksityisyys"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Lähdekoodi"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Ota yhteyttä"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
@@ -5572,7 +5699,7 @@ msgstr "StatusNet-ohjelmiston lisenssi"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5582,7 +5709,7 @@ msgstr ""
"site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -5591,7 +5718,7 @@ msgstr "**%%site.name%%** on mikroblogipalvelu."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5603,51 +5730,51 @@ msgstr ""
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Sivutus"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Myöhemmin"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Aiemmin"
@@ -5802,12 +5929,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5893,11 +6020,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Peruuta"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5925,12 +6047,6 @@ msgstr "Poista"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-#, fuzzy
-msgid "Attachments"
-msgstr "Liitettä ei ole."
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
#, fuzzy
@@ -6363,14 +6479,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Päivitykset SMS:llä"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Yhdistä"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -7088,24 +7204,24 @@ msgstr "Tönäise"
msgid "Send a nudge to this user"
msgstr "Lähetä tönäisy tälle käyttäjälle"
-#: lib/oauthstore.php:283
+#: 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 "Ei voitu lisätä uutta tilausta."
@@ -7474,17 +7590,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7492,12 +7608,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7505,12 +7621,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7518,12 +7634,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7531,7 +7647,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 56b5a6eee..3704732c8 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -20,17 +20,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:35+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:42+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -101,14 +101,15 @@ msgstr "Enregistrer"
msgid "No such page."
msgstr "Page non trouvée."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -211,12 +212,13 @@ msgstr "Vous et vos amis"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Statuts de %1$s et ses amis dans %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -243,7 +245,7 @@ msgstr "Méthode API non trouvée !"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -319,45 +321,64 @@ msgstr "Le blocage de l’utilisateur a échoué."
msgid "Unblock user failed."
msgstr "Le déblocage de l’utilisateur a échoué."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Messages direct depuis %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Tous les messages directs envoyés par %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Messages directs envoyés à %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Tous les messages directs envoyés à %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Message sans texte !"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
-
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] ""
+"C’est trop long ! La taille maximale du message est de %d caractères."
+msgstr[1] ""
+"C’est trop long ! La taille maximale du message est de %d caractères."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Destinataire non trouvé."
-#: 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 ""
"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
"comme amis."
+#. 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 ""
+"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -539,15 +560,21 @@ msgstr "groupes sur %s"
msgid "Upload failed."
msgstr "Échec du téléversement."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Jeton d’identification invalide."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Paramètre oauth_token non fourni."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Jeton incorrect."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -567,39 +594,25 @@ msgstr ""
"Un problème est survenu avec votre jeton de session. Veuillez essayer à "
"nouveau."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Pseudo ou mot de passe incorrect !"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Erreur de la base de données lors de la suppression de l’utilisateur de "
"l’application OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Le jeton de connexion %s a été autorisé. Merci de l’échanger contre un jeton "
-"d’accès."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Le jeton de connexion %s a été refusé et révoqué."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -608,16 +621,16 @@ msgstr "Le jeton de connexion %s a été refusé et révoqué."
msgid "Unexpected form submission."
msgstr "Soumission de formulaire inattendue."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
"Une application vous demande l’autorisation de se connecter à votre compte"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Autoriser ou refuser l’accès"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -630,11 +643,11 @@ msgstr ""
"confiance."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Compte"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -643,23 +656,47 @@ msgid "Nickname"
msgstr "Pseudo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Mot de passe"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Refuser"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Annuler"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Autoriser"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Autoriser ou refuser l’accès à votre compte."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Confirmation de messagerie instantanée annulée."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Le jeton de connexion %s a été refusé et révoqué."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Vous n’êtes pas autorisé."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ce processus requiert un POST ou un DELETE."
@@ -824,7 +861,8 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Supprimer"
@@ -880,12 +918,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Non"
@@ -898,12 +937,13 @@ msgstr "Ne pas bloquer cet utilisateur"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Oui"
@@ -918,9 +958,12 @@ msgstr "Bloquer cet utilisateur"
msgid "Failed to save block information."
msgstr "Impossible d’enregistrer les informations de blocage."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1046,7 +1089,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1074,6 +1117,67 @@ msgstr "Ne pas supprimer cette application"
msgid "Delete this application"
msgstr "Supprimer cette application"
+#. 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 "Vous devez ouvrir une session pour quitter un groupe."
+
+#. 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 "Aucun pseudo ou 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 "Vous n’êtes pas membre de ce groupe."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Impossible de mettre à jour le groupe."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s a quitté le groupe %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Supprimer l’utilisateur"
+
+#: 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 ""
+"Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
+"données à son propos de la base de données, sans sauvegarde."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Ne pas supprimer cet avis"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Supprimer cet utilisateur"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1150,54 +1254,64 @@ msgstr "Conception"
msgid "Design settings for this StatusNet site"
msgstr "Paramètres de conception pour ce site StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL du logo invalide."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL du logo invalide."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Le thème n’est pas disponible : %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Modifier le logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo du site"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo du site"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Modifier le thème"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Thème du site"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Thème pour le site."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Thème personnalisé"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Vous pouvez importer un thème StatusNet personnalisé dans une archive .ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1207,66 +1321,66 @@ msgstr ""
"maximale du fichier est de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Activé"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Désactivé"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activer ou désactiver l’image d’arrière plan."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifier les couleurs"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contenu"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barre latérale"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texte"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avancé"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personnalisé"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1276,7 +1390,7 @@ msgstr "Revenir aux valeurs par défaut"
msgid "Save"
msgstr "Enregistrer"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -1750,7 +1864,7 @@ msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le service distant utilise une version inconnue du protocole OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Erreur lors de la mise à jour du profil distant."
@@ -2356,10 +2470,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Aucun pseudo ou ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2611,6 +2721,11 @@ msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
msgid "No content!"
msgstr "Aucun contenu !"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Aucun destinataire n’a été spécifié."
@@ -2775,7 +2890,7 @@ msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2924,147 +3039,166 @@ msgstr "Chemins"
msgid "Path and server settings for this StatusNet site"
msgstr "Paramètres de chemin et serveur pour ce site StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Dossier des thème non lisible : %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Dossier des avatars non inscriptible : %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Dossier des arrière plans non inscriptible : %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Dossier des paramètres régionaux non lisible : %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Serveur"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nom d’hôte du serveur du site."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Chemin"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Chemin du site"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Chemin vers les paramètres régionaux"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Dossier des thèmes"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Chemin de dossier vers les paramètres régionaux"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Jolies URL"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Utiliser des jolies URL (plus lisibles et faciles à mémoriser) ?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Thème"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Serveur de thèmes"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Thème pour le site."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Chemin des thèmes"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Serveur SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Chemin du site"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Dossier des thèmes"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Chemin de dossier vers les paramètres régionaux"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Serveur d’avatar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Chemin des avatars"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Dossier des avatars"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Arrière plans"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Serveur des arrière plans"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Chemin des arrière plans"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Dossier des arrière plans"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Pièces jointes"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Jamais"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Quelquefois"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Toujours"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Utiliser SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quand utiliser SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Serveur SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Serveur vers lequel rediriger les requêtes SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Enregistrer les chemins."
@@ -3844,7 +3978,7 @@ msgstr "Organisation"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistiques"
@@ -3987,45 +4121,45 @@ msgstr "Alias"
msgid "Group actions"
msgstr "Actions du groupe"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fil des avis du groupe %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fil des avis du groupe %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fil des avis du groupe %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "ami d’un ami pour le groupe %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membres"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(aucun)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Tous les membres"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Créé"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4041,7 +4175,7 @@ msgstr ""
"action.register%%%%) pour devenir membre de ce groupe et bien plus ! ([En "
"lire plus](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4054,7 +4188,7 @@ msgstr ""
"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
"messages courts à propos de leur vie et leurs intérêts. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administrateurs"
@@ -5023,7 +5157,7 @@ msgid "Plugins"
msgstr "Extensions"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Version"
@@ -5261,7 +5395,7 @@ msgid "Unable to save tag."
msgstr "Impossible d’enregistrer l’étiquette."
#. 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 "Il vous a été interdit de vous abonner."
@@ -5381,185 +5515,185 @@ msgid "Untitled page"
msgstr "Page sans nom"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personnel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Se connecter aux services"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Connexion"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Fermer la session"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Déconnexion"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Créer un compte"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "S’inscrire"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Connexion"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Aide"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Rechercher"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Notice du site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vues locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Avis de la page"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Aide"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "À propos"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "CGU"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Confidentialité"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Source"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contact"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insigne"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
@@ -5567,7 +5701,7 @@ msgstr "Licence du logiciel StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5577,7 +5711,7 @@ msgstr ""
"%site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -5586,7 +5720,7 @@ msgstr "**%%site.name%%** est un service de micro-blogging."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5598,20 +5732,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licence du contenu du site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5619,7 +5753,7 @@ msgstr ""
"réservés."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
@@ -5627,26 +5761,26 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Après"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Avant"
@@ -5788,12 +5922,12 @@ msgid "Could not authenticate you."
msgstr "Impossible de vous authentifier."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Révocation essayée d’un jeton inconnu."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Impossible de supprimer un jeton révoqué."
@@ -5878,11 +6012,6 @@ msgstr ""
"Accès par défaut pour cette application : en lecture seule ou en lecture-"
"écriture"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Annuler"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5909,11 +6038,6 @@ msgstr "Révoquer"
msgid "author element must contain a name element."
msgstr "l’élément « auteur » doit contenir un élément « nom »."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Pièces jointes"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6383,14 +6507,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Suivi des avis par SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexions"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Applications autorisées connectées"
@@ -7196,24 +7320,24 @@ msgstr "Clin d’œil"
msgid "Send a nudge to this user"
msgstr "Envoyer un clin d’œil à cet utilisateur"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Erreur lors de l’insertion du nouveau profil."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Erreur lors de l’insertion de l’avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Erreur lors de l’insertion du profil distant."
#. 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 "Avis en doublon."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Impossible d’insérer un nouvel abonnement."
@@ -7572,17 +7696,17 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7590,12 +7714,12 @@ msgstr[0] "une minute"
msgstr[1] "%d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7603,12 +7727,12 @@ msgstr[0] "une heure"
msgstr[1] "%d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7616,12 +7740,12 @@ msgstr[0] "un jour"
msgstr[1] "%d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7629,7 +7753,7 @@ msgstr[0] "un"
msgstr[1] "%d"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 924661cb2..2328b8843 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:42+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:42+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -99,14 +99,15 @@ msgstr "Gardar"
msgid "No such page."
msgstr "Non existe a etiqueta."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "%s e amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións dende %1$s e amigos en %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -234,7 +236,7 @@ msgstr "Método da API non atopado"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -311,44 +313,65 @@ msgstr "Bloqueo de usuario fallido."
msgid "Unblock user failed."
msgstr "Desbloqueo de usuario fallido."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, fuzzy, php-format
msgid "Direct messages from %s"
msgstr "Mensaxes directas para %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Tódalas mensaxes directas enviadas dende %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Mensaxes directas para %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Tódalas mensaxes directas enviadas a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Non hai mensaxes de texto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Podes actualizar a túa información do perfil persoal aquí"
+msgstr[1] "Podes actualizar a túa información do perfil persoal aquí"
+msgstr[2] "Podes actualizar a túa información do perfil persoal aquí"
+msgstr[3] "Podes actualizar a túa información do perfil persoal aquí"
+msgstr[4] "Podes actualizar a túa información do perfil persoal aquí"
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Usuario destinatario non atopado."
-#: 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 ""
"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
+#. 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 ""
+"Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón "
+"vante tomar por tolo."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -534,16 +557,21 @@ msgstr "Outras opcions"
msgid "Upload failed."
msgstr "Comando fallido"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Contido do chío inválido"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "Tamaño inválido."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -561,37 +589,25 @@ msgstr "Tamaño inválido."
msgid "There was a problem with your session token. Try again, please."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "Usuario ou contrasinal inválidos."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Acounteceu un erro configurando o usuario."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "Erro ó inserir o hashtag na BD: %s"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -600,15 +616,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Envio de formulario non esperada."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -617,12 +633,12 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
#, fuzzy
msgid "Account"
msgstr "Sobre"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -631,22 +647,45 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasinal"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr ""
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancelar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
#, fuzzy
msgid "Allow"
msgstr "Todos"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Sen código de confirmación."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -812,7 +851,8 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Eliminar chío"
@@ -870,12 +910,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
#, fuzzy
msgctxt "BUTTON"
msgid "No"
@@ -890,12 +931,13 @@ msgstr "Bloquear usuario"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -912,9 +954,12 @@ msgstr "Bloquear usuario"
msgid "Failed to save block information."
msgstr "Erro ao gardar información de bloqueo."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1046,7 +1091,7 @@ msgstr "Non estás suscrito a ese perfil"
#. 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:1307
+#: lib/action.php:1353
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -1075,6 +1120,65 @@ msgstr "Non se pode eliminar este chíos."
msgid "Delete this application"
msgstr "Eliminar chío"
+#. 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 "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#. 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 "Sen alcume."
+
+#. 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 "Non estás suscrito a ese perfil"
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Non se puido actualizar o usuario."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "Estado de %1$s en %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Eliminar chío"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Non se pode eliminar este chíos."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Eliminar chío"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1155,58 +1259,68 @@ msgstr ""
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
#, fuzzy
msgid "Invalid logo URL."
msgstr "Tamaño inválido."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Tamaño inválido."
+
+#: actions/designadminpanel.php:341
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Modificado"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
#, fuzzy
msgid "Site logo"
msgstr "Invitar"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Invitar"
+
+#: actions/designadminpanel.php:466
#, fuzzy
msgid "Change theme"
msgstr "Modificado"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
#, fuzzy
msgid "Site theme"
msgstr "Novo chío"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Novo chío"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1214,69 +1328,69 @@ msgid ""
msgstr "Podes actualizar a túa información do perfil persoal aquí"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Cambiar contrasinal"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Conectar"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Buscar"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Inicio de sesión"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1286,7 +1400,7 @@ msgstr ""
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1784,7 +1898,7 @@ msgstr "Non se pode convertir o token da petición a tokens de acceso."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versión de protocolo OMB descoñecida."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Acounteceu un erro actualizando o perfil remoto"
@@ -2380,11 +2494,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Sen alcume."
-
#: actions/joingroup.php:141
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
@@ -2636,6 +2745,11 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "No content!"
msgstr "Sen contido!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Non se especificou ningún destinatario"
@@ -2798,7 +2912,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2953,157 +3067,174 @@ msgstr ""
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, fuzzy, php-format
msgid "Avatar directory not writable: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
#, fuzzy
msgid "Site"
msgstr "Invitar"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
#, fuzzy
msgid "Server"
msgstr "Recuperar"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
#, fuzzy
msgid "Site path"
msgstr "Novo chío"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Avatar actualizado."
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+msgid "Server for themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+#, fuzzy
+msgid "SSL server"
+msgstr "Recuperar"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Novo chío"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Avatar actualizado."
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatars"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "Avatar actualizado."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
#, fuzzy
msgid "Avatar directory"
msgstr "Avatar actualizado."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
msgstr ""
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
#, fuzzy
msgid "Never"
msgstr "Recuperar"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
#, fuzzy
msgid "Sometimes"
msgstr "Chíos"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Recuperar"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Novo chío"
@@ -3885,7 +4016,7 @@ msgstr "Invitación(s) enviada(s)."
msgid "Description"
msgstr "Subscricións"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estatísticas"
@@ -4021,47 +4152,47 @@ msgstr ""
msgid "Group actions"
msgstr "Outras opcions"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte para os amigos de %s"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte para os amigos de %s"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de chíos para %s"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "Band. Saída para %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
#, fuzzy
msgid "Members"
msgstr "Membro dende"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 lib/profileaction.php:117
#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
#, fuzzy
msgid "(None)"
msgstr "(nada)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr ""
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Destacado"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4075,7 +4206,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4088,7 +4219,7 @@ msgstr ""
"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr ""
@@ -5043,7 +5174,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
#, fuzzy
msgid "Version"
msgstr "Persoal"
@@ -5287,7 +5418,7 @@ msgid "Unable to save tag."
msgstr "Non se poden gardar as etiquetas."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
@@ -5415,44 +5546,44 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
@@ -5460,13 +5591,13 @@ msgstr "Navegación de subscricións"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -5475,71 +5606,71 @@ msgstr ""
"este servizo."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear nova conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Rexistrar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Inicio de sesión"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:509
+#: lib/action.php:537
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5547,70 +5678,70 @@ msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Preguntas frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contacto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr ""
@@ -5618,7 +5749,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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5628,7 +5759,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é un servizo de microbloguexo."
@@ -5637,7 +5768,7 @@ msgstr "**%%site.name%%** é un servizo de microbloguexo."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5649,51 +5780,51 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Outros"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
#, fuzzy
msgid "Before"
msgstr "Antes »"
@@ -5848,12 +5979,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5943,11 +6074,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancelar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5974,11 +6100,6 @@ msgstr "Recuperar"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr ""
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6446,14 +6567,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Chíos dende SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Conectar"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -7223,24 +7344,24 @@ msgstr "Toque enviado"
msgid "Send a nudge to this user"
msgstr "Non podes enviar mensaxes a este usurio."
-#: lib/oauthstore.php:283
+#: 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 "Non se puido inserir a nova subscrición."
@@ -7619,17 +7740,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7640,12 +7761,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7656,12 +7777,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7672,12 +7793,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7688,7 +7809,7 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 9b851f719..5f4ecb39b 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:44+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:43+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -92,14 +92,15 @@ msgstr "Gardar"
msgid "No such page."
msgstr "Esa páxina non existe."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "Vostede e mailos seus amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións de %1$s e amigos en %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "Non se atopou o método da API."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,45 +311,62 @@ msgstr "Non se puido bloquear o usuario."
msgid "Unblock user failed."
msgstr "Non se puido desbloquear o usuario."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Mensaxes directas de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Todas as mensaxes directas enviadas por %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Mensaxes directas a %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Todas as mensaxes directas enviadas a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "A mensaxe non ten texto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] ""
+"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
+msgstr[1] ""
"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Non se atopou o destinatario."
-#: 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 ""
"Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
+#. 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 "Non se envíe unha mensaxe, limítese a pensar nela."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -529,15 +548,21 @@ msgstr "grupos en %s"
msgid "Upload failed."
msgstr "Houbo un erro durante a carga."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "O pase especificado é incorrecto."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Non se forneceu o parámetro oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Pase incorrecto."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -555,38 +580,26 @@ msgstr "Pase incorrecto."
msgid "There was a problem with your session token. Try again, please."
msgstr "Houbo un erro co seu pase. Inténteo de novo."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "O alcume ou o contrasinal son incorrectos!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Houbo un erro na base de datos ao intentar borrar o usuario da aplicación "
"OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
"OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "Autorizouse a ficha da solicitude %s. Intercámbiea por un pase."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Denegouse e revogouse a ficha da solicitude %s."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -595,15 +608,15 @@ msgstr "Denegouse e revogouse a ficha da solicitude %s."
msgid "Unexpected form submission."
msgstr "Envío de formulario inesperado."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Unha aplicación quere conectarse á súa conta"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permitir ou denegar o acceso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -615,11 +628,11 @@ msgstr ""
"acceso á súa conta %4$s a xente de confianza."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -628,23 +641,47 @@ msgid "Nickname"
msgstr "Alcume"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasinal"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Denegar"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancelar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permitir"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permitir ou denegar o acceso á información da súa conta."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Cancelouse a confirmación por mensaxería instantánea."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Denegouse e revogouse a ficha da solicitude %s."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Non está autorizado."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método require un POST ou un DELETE."
@@ -809,7 +846,8 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Borrar"
@@ -865,12 +903,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Non"
@@ -883,12 +922,13 @@ msgstr "Non bloquear este usuario"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
@@ -903,9 +943,12 @@ msgstr "Bloquear este usuario"
msgid "Failed to save block information."
msgstr "Non se puido gardar a información do bloqueo."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1031,7 +1074,7 @@ msgstr "Non é o dono desa aplicación."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Houbo un problema co seu pase."
@@ -1059,6 +1102,67 @@ msgstr "Non borrar a aplicación"
msgid "Delete this application"
msgstr "Borrar a aplicación"
+#. 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 "Ten que identificarse para deixar un grupo."
+
+#. 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 "Nin alcume nin 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 "Vostede non pertence a este grupo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Non se puido actualizar o grupo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s deixou o grupo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Borrar o usuario"
+
+#: 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 ""
+"Está seguro de querer borrar este usuario? Isto borrará todos os datos do "
+"usuario da base de datos, sen posibilidade de recuperalos."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Non borrar esta nota"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Borrar o usuario"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1135,54 +1239,64 @@ msgstr "Deseño"
msgid "Design settings for this StatusNet site"
msgstr "Configuración de deseño para este sitio StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL do logo incorrecto."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL do logo incorrecto."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "O tema visual non está dispoñible: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Cambiar o logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo do sitio"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo do sitio"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Cambar o tema visual"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema visual do sitio"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema visual para o sitio."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Tema visual personalizado"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Pode cargar como arquivo .ZIP un tema visual personalizado para StatusNet"
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar a imaxe de fondo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1192,66 +1306,66 @@ msgstr ""
"ficheiro é de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Activado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivado"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar ou desactivar a imaxe de fondo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imaxe de fondo en mosaico"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar as cores"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contido"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Ligazóns"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar os valores por defecto"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar o deseño por defecto"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver ao deseño por defecto"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1261,7 +1375,7 @@ msgstr "Volver ao deseño por defecto"
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Gardar o deseño"
@@ -1739,7 +1853,7 @@ msgstr "Non se puido converter a ficha da solicitude nun pase."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "O servizo remoto utiliza unha versión descoñecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Houbo un erro ao actualizar o perfil remoto."
@@ -2334,10 +2448,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Ten que identificarse para unirse a un grupo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nin alcume nin ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2587,6 +2697,12 @@ msgstr "Non pode enviarlle unha mensaxe a este usuario."
msgid "No content!"
msgstr "Non hai contido ningún!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Non se especificou ningún destinatario."
@@ -2748,7 +2864,7 @@ msgstr "Só %s enderezos URL sobre HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Non se soporta ese formato de datos."
@@ -2899,147 +3015,166 @@ msgstr "Rutas"
msgid "Path and server settings for this StatusNet site"
msgstr "Configuración do servidor e das rutas para este sitio StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Non se pode ler o directorio de temas visuais: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Non se pode escribir no directorio de avatares: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Non se pode escribir no directorio de fondos: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Non se pode ler o directorio de traducións: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Servidor SSL incorrecto. O tamaño máximo é de 255 caracteres."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Sitio"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servidor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nome do servidor do sitio."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Ruta"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Ruta do sitio"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Ruta das traducións"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directorio de temas visuais"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Ruta do directorio das traducións"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Enderezos URL elegantes"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Quere utilizar os enderezos URL elegantes (mellores de ler e lembrar)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema visual"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servidor de temas visuais"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema visual para o sitio."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servidor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Ruta do sitio"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Ruta do tema visual"
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directorio de temas visuais"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Ruta do directorio das traducións"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servidor de avatares"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Ruta do avatar"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directorio de avatares"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fondos"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servidor de fondos"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Ruta do fondo"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directorio de fondos"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Ficheiros anexos"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Ás veces"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Utilizar SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Cando utilizar SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servidor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servidor ao que dirixir as solicitudes SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Gardar as rutas"
@@ -3819,7 +3954,7 @@ msgstr "Organización"
msgid "Description"
msgstr "Descrición"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estatísticas"
@@ -3963,45 +4098,45 @@ msgstr "Pseudónimos"
msgid "Group actions"
msgstr "Accións do grupo"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de novas das notas do grupo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Amigo dun amigo para o grupo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ningún)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Creado"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4017,7 +4152,7 @@ msgstr ""
"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo "
"e de moitos máis! ([Máis información](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4030,7 +4165,7 @@ msgstr ""
"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administradores"
@@ -4989,7 +5124,7 @@ msgid "Plugins"
msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versión"
@@ -5005,9 +5140,9 @@ msgstr "Marcar como favorito"
#. 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) marcou a súa nota como favorita"
+msgstr "%1$s marcou a nota %2$s como favorita"
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:142
@@ -5188,9 +5323,9 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. 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:1120
-#, fuzzy, php-format
+#, php-format
msgid "Could not save reply for %1$d, %2$d."
-msgstr "Non se puido gardar a información do grupo local."
+msgstr "Non se puido gardar a resposta a %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.
@@ -5226,7 +5361,7 @@ msgid "Unable to save tag."
msgstr "Non se puido gardar a nota do sitio."
#. 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 "Prohibíuselle realizar subscricións de momento."
@@ -5268,9 +5403,9 @@ msgstr "Seguir"
#. 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 uniuse ao grupo %2$s."
+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.
@@ -5346,185 +5481,185 @@ msgid "Untitled page"
msgstr "Páxina sen título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navegación principal do sitio"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Liña do tempo do perfil persoal e os amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conectarse aos servizos"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Cambiar a configuración do sitio"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide a amigos e compañeiros a unírselle en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Saír ao anonimato"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Saír"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear unha conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Rexistrarse"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Identificarse no sitio"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Identificarse"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Axuda!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Buscar persoas ou palabras"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Nota do sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Nota da páxina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navegación secundaria do sitio"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Preguntas máis frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Condicións do servicio"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Protección de datos"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contacto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licenza do software StatusNet"
@@ -5532,7 +5667,7 @@ msgstr "Licenza do software StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5542,7 +5677,7 @@ msgstr ""
"site.broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -5551,7 +5686,7 @@ msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5563,20 +5698,20 @@ msgstr ""
"GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licenza dos contidos do sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O contido e os datos de %1$s son privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5584,7 +5719,7 @@ msgstr ""
"todos os dereitos."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -5592,26 +5727,26 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paxinación"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Posteriores"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Anteriores"
@@ -5754,12 +5889,12 @@ msgid "Could not authenticate you."
msgstr "Non puidemos autenticalo."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Intentouse revogar un pase descoñecido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Erro ao borrar o pase revogado."
@@ -5843,11 +5978,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Permisos por defecto para esta aplicación: lectura ou lectura e escritura"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancelar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5874,11 +6004,6 @@ msgstr "Revogar"
msgid "author element must contain a name element."
msgstr "o elemento \"autor\" debe conter un nome."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Ficheiros anexos"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6342,14 +6467,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Actualizacións por SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Conexións"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Aplicacións conectadas autorizadas"
@@ -7151,24 +7276,24 @@ msgstr "Facer un aceno"
msgid "Send a nudge to this user"
msgstr "Facerlle un aceno a este usuario"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Houbo un erro ao inserir o novo perfil."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Houbo un erro ao inserir o avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Houbo un erro ao inserir o perfil remoto."
#. 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 "Nota duplicada."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Non se puido inserir unha subscrición nova."
@@ -7474,9 +7599,9 @@ msgstr "Cancelar a subscrición"
#. 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
-#, fuzzy, php-format
+#, php-format
msgid "User %1$s (%2$d) has no profile record."
-msgstr "O usuario non ten perfil."
+msgstr "O usuario %1$s (%2$d) non ten perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -7525,17 +7650,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7543,12 +7668,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7556,12 +7681,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7569,12 +7694,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7582,7 +7707,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:1184
+#: lib/util.php:1194
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 08ea249d4..86158bac0 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:45+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:44+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +93,15 @@ msgstr "Składować"
msgid "No such page."
msgstr "Strona njeeksistuje."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -194,12 +195,13 @@ msgstr "Ty a přećeljo"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacije wot %1$s a přećelow na %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -226,7 +228,7 @@ msgstr "API-metoda njenamakana."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -299,45 +301,62 @@ msgstr "Blokowanje wužiwarja je so njeporadźiło."
msgid "Unblock user failed."
msgstr "Wotblokowanje wužiwarja je so njeporadźiło."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direktne powěsće z %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Wšě z %s pósłane direktne powěsće"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direktne powěsće do %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Wšě do %s pósłane direktne powěsće"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Žadyn powěsćowy tekst!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
-
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+msgstr[1] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+msgstr[2] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+msgstr[3] "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Přijimowar njenamakany."
-#: 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 ""
"Njeje móžno, direktne powěsće wužiwarjam pósłać, kotřiž twoji přećeljo "
"njejsu."
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -519,15 +538,21 @@ msgstr "skupiny na %s"
msgid "Upload failed."
msgstr "Nahraće je so njeporadźiło."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Njepłaćiwe přizjewjenske znamješko podate."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Njepłaćiwy token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -545,34 +570,22 @@ msgstr "Njepłaćiwy token."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Njepłaćiwe přimjeno abo hesło!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Zmylk datoweje banki při zhašenju wužiwarja OAuth-aplikacije."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -581,15 +594,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Njewočakowane wotpósłanje formulara."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Aplikacija chce so z twojom kontom zwjazać"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Přistup dowolić abo wotpokazać"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -598,11 +611,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -611,23 +624,47 @@ msgid "Nickname"
msgstr "Přimjeno"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hesło"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Wotpokazać"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Přetorhnyć"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Dowolić"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Přistup ke kontowym informacijam dowolić abo wotpokazać."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM-wobkrućenje přetorhnjene."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Njejsy awtorizowany."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Tuta metoda wužaduje sej POST abo DELETE."
@@ -790,7 +827,8 @@ msgid "Preview"
msgstr "Přehlad"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Zničić"
@@ -843,12 +881,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ně"
@@ -861,12 +900,13 @@ msgstr "Tutoho wužiwarja njeblokować"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Haj"
@@ -882,9 +922,12 @@ msgstr "Tutoho wužiwarja blokować"
msgid "Failed to save block information."
msgstr "Njeje móžno, sydłowu zdźělenku składować."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1011,7 +1054,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1036,6 +1079,64 @@ msgstr "Tutu aplikaciju njezničić"
msgid "Delete this application"
msgstr "Tutu aplikaciju zničić"
+#. 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 "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
+
+#. 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 "Žane přimjeno abo žadyn 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 "Njejsy čłon tuteje skupiny."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Skupina njeje so dała aktualizować."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s je skupinu %2$s wopušćił"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Wužiwarja wušmórnyć"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Tutu zdźělenku njewušmórnyć"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Tutoho wužiwarja wušmórnyć"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1108,53 +1209,63 @@ msgstr "Design"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Njepłaćiwy logowy URL."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Njepłaćiwy logowy URL."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Šat njesteji k dispoziciji: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Logo změnić"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo sydła"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo sydła"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Šat změnić"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Šat sydła"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Šat za sydło."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Swójski šat"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Móžeš swójski šat StatusNet jako .ZIP-archiw nahrać."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Pozadkowy wobraz změnić"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadk"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1163,68 +1274,68 @@ msgstr ""
"Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Zapinjeny"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Wupinjeny"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
#, fuzzy
msgid "Turn background image on or off."
msgstr "Pozadkowy wobraz změnić"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "Pozadkowy wobraz změnić"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Barby změnić"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Wobsah"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Bóčnica"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Wotkazy"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Rozšěrjeny"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Swójski CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardne hódnoty wužiwać"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standardne designy wobnowić"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1234,7 +1345,7 @@ msgstr "Na standard wróćo stajić"
msgid "Save"
msgstr "Składować"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Design składować"
@@ -1702,7 +1813,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Zmylk při aktualizaciji zdaleneho profila."
@@ -2250,10 +2361,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Žane přimjeno abo žadyn ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2495,6 +2602,11 @@ msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
msgid "No content!"
msgstr "Žadyn wobsah!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Žadyn přijimowar podaty."
@@ -2649,7 +2761,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2802,147 +2914,166 @@ msgstr "Šćežki"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Šatowy zapis njeda so čitać: %s"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Do awataroweho zapisa njeda so pisać: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Šatowy zapis njeda so čitać: %s"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Sydło"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Serwer"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Šćežka"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Sydłowa šćežka"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Šćežka k lokalam"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Šatowy zapis"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Zapisowa šćežka k lokalam"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Šat"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Šatowy serwer"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Šat za sydło."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Šatowa šćežka"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-serwer"
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Sydłowa šćežka"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Šatowy zapis"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Zapisowa šćežka k lokalam"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Awatary"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Awatarowy serwer"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Awatarowa šćežka"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Awatarowy zapis"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Pozadki"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Pozadkowy serwer"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Pozadkowa šćežka"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Pozadkowy zapis"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Přiwěški"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Ženje"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Druhdy"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Přeco"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL wužiwać"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-serwer"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Šćežki składować"
@@ -3665,7 +3796,7 @@ msgstr "Organizacija"
msgid "Description"
msgstr "Wopisanje"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistika"
@@ -3800,45 +3931,45 @@ msgstr "Aliasy"
msgid "Group actions"
msgstr "Skupinske akcije"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "FOAF za %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Čłonojo"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Žadyn)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Wšitcy čłonojo"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Wutworjeny"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3848,7 +3979,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3857,7 +3988,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administratorojo"
@@ -4769,7 +4900,7 @@ msgid "Plugins"
msgstr "Tykače"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Wersija"
@@ -5004,7 +5135,7 @@ msgid "Unable to save tag."
msgstr "Njeje móžno, tafličku składować."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Tutón wužiwar ći abonowanje njedowoli."
@@ -5126,190 +5257,190 @@ msgid "Untitled page"
msgstr "Strona bjez titula"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "Zakładna sydłowa konfiguracija"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Wosobinski"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ze słužbami zwjazać"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Zwjazać"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Sydłowu konfiguraciju změnić"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Přeprosyć"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Ze sydła wotzjewić"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Wotzjewić"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Konto załožić"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrować"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Při sydle přizjewić"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Přizjewjenje"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Pytać"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
#, fuzzy
msgid "Site notice"
msgstr "Sydłowa zdźělenka"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
#, fuzzy
msgid "Local views"
msgstr "Lokalny"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
#, fuzzy
msgid "Page notice"
msgstr "Nowa zdźělenka"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "Zakładna sydłowa konfiguracija"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Wo"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Huste prašenja"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Priwatnosć"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Žórło"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr ""
@@ -5317,7 +5448,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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5325,7 +5456,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5334,7 +5465,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5343,52 +5474,52 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "Wobsah zdźělenkow přepytać"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
#, fuzzy
msgid "Pagination"
msgstr "Registrowanje"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Po"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Před"
@@ -5531,12 +5662,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5622,11 +5753,6 @@ msgstr "Popisujomny"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Přetorhnyć"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5653,11 +5779,6 @@ msgstr "Wotwołać"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Přiwěški"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6085,14 +6206,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Aktualizacije přez SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Zwiski"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Awtorizowane zwjazane aplikacije"
@@ -6794,24 +6915,24 @@ msgstr ""
msgid "Send a nudge to this user"
msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-#: lib/oauthstore.php:283
+#: 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 "Nowy abonement njeda so zasunyć."
@@ -7169,17 +7290,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7189,12 +7310,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7204,12 +7325,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7219,12 +7340,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7234,7 +7355,7 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 9097b66db..9556436ac 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:47+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:45+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-10-04 23:06:40+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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"
@@ -95,14 +95,15 @@ msgstr "Mentés"
msgid "No such page."
msgstr "Nincs ilyen lap."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -200,12 +201,13 @@ msgstr "Te és a barátaid"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon: %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -232,7 +234,7 @@ msgstr "Az API-metódus nem található."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -306,44 +308,60 @@ msgstr "Nem sikerült a felhasználó blokkolása."
msgid "Unblock user failed."
msgstr "Nem sikerült a felhasználó blokkjának feloldása."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Közvetlen üzenetek tőle: %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s által küldött összes közvetlen üzenetek"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Közvetlen üzenetek neki: %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%s részére küldött összes közvetlen üzenet"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Az üzenetnek nincs szövege!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
+msgstr[1] "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "A címzett felhasználó nem található."
-#: 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 ""
"Nem küldhetsz közvetlen üzenetet olyan felhasználóknak, akik nem a barátaid."
+#. 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 "Ne küldj üzenetet magadnak, helyette mondd el halkan."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -523,15 +541,20 @@ msgstr "%s csoportok"
msgid "Upload failed."
msgstr ""
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+msgid "Invalid request token or verifier."
+msgstr ""
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Érvénytelen token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -549,34 +572,22 @@ msgstr "Érvénytelen token."
msgid "There was a problem with your session token. Try again, please."
msgstr "Probléma volt a munkameneted tokenjével. Kérlek, próbáld újra."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Érvénytelen becenév / jelszó!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -585,15 +596,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Váratlan űrlapbeküldés."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Egy alkalmazás szeretne csatlakozni a kontódhoz"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Elérés engedélyezése vagy tiltása"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -602,11 +613,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Kontó"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -615,23 +626,46 @@ msgid "Nickname"
msgstr "Becenév"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Jelszó"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Tiltjuk"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Mégse"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Engedjük"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Engedélyezheted vagy megtilthatod a kontód megtekintését."
+#: actions/apioauthauthorize.php:433
+msgid "Authorization canceled."
+msgstr ""
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Nincs jogosultságod."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -793,7 +827,8 @@ msgid "Preview"
msgstr "Előnézet"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Törlés"
@@ -846,12 +881,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nem"
@@ -864,12 +900,13 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Igen"
@@ -884,9 +921,12 @@ msgstr "Felhasználó blokkolása"
msgid "Failed to save block information."
msgstr "Nem sikerült elmenteni a blokkolási információkat."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1012,7 +1052,7 @@ msgstr ""
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1037,6 +1077,67 @@ msgstr ""
msgid "Delete this application"
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 "Be kell jelentkezned hogy elhagyhass egy csoportot."
+
+#. 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 "Nincs nicknév vagy azonosító."
+
+#. 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 "Nem vagy tagja ennek a csoportnak."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Nem sikerült a csoport frissítése."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Felhasználó törlése"
+
+#: 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 ""
+"Biztosan törölni szeretnéd ezt a felhasználót? Ezzel minden róla szóló "
+"adatot törlünk az adatbázisból, biztonsági mentés nélkül."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Ne töröljük ezt a hírt"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Töröljük ezt a felhasználót"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1111,53 +1212,63 @@ msgstr "Megjelenés"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Érvénytelen logó URL."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Érvénytelen logó URL."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr ""
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Logó megváltoztatása"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Oldal logója"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Oldal logója"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Téma megváltoztatása"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Webhely-téma"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "A webhely témája."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr ""
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Háttérkép megváltoztatása"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Háttér"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1165,66 +1276,66 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Be"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Ki"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Háttérkép be- vagy kikapcsolása."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Háttérkép csempézése"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Színek megváltoztatása"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Tartalom"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Oldalsáv"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Szöveg"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Hivatkozások"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Alapértelmezések használata"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Visszaállítás az alapértelmezettre"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1234,7 +1345,7 @@ msgstr "Visszaállítás az alapértelmezettre"
msgid "Save"
msgstr "Mentés"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Design mentése"
@@ -1706,7 +1817,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Nem sikerült frissíteni a távoli profilt."
@@ -2253,10 +2364,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Be kell jelentkezned, ha csatlakozni szeretnél a csoporthoz."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nincs nicknév vagy azonosító."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2497,6 +2604,11 @@ msgstr "Ennek a felhasználónak nem küldhetsz üzenetet."
msgid "No content!"
msgstr "Nincs tartalom!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Ez túl hosszú. Az üzenet mérete legfeljebb %d karakter lehet."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Nincs címzett megadva."
@@ -2648,7 +2760,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Nem támogatott adatformátum."
@@ -2796,147 +2908,166 @@ msgstr "Útvonalak"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Webhely"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Szerver"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "A webhely kiszolgálójának neve."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Útvonal"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Webhely útvonala"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "A nyelvi fájlok elérési útvonala"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Avatar-könyvtár"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "A nyelvi fájlok elérési útvonala"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Téma"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "A webhely témája."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Téma elérési útvonala"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-kiszolgáló"
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Webhely útvonala"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Avatar-könyvtár"
+
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "A nyelvi fájlok elérési útvonala"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatarok"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar-kiszolgáló"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr ""
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatar-könyvtár"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Hátterek"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr ""
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Csatolmányok"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Soha"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Időnként"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Mindig"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL használata"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Mikor használjunk SSL-t"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-kiszolgáló"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Elérési útvonalak mentése"
@@ -3663,7 +3794,7 @@ msgstr "Szervezet"
msgid "Description"
msgstr "Leírás"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statisztika"
@@ -3796,45 +3927,45 @@ msgstr "Álnevek"
msgid "Group actions"
msgstr "Csoport-tevékenységek"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s csoport RSS 1.0 hírcsatornája"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s csoport RSS 2.0 hírcsatornája"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s csoport Atom hírcsatornája"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF a %s csoportnak"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Tagok"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(nincs)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Összes tag"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Létrehoztuk"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3850,7 +3981,7 @@ msgstr ""
"[Csatlakozz](%%%%action.register%%%%), és légy tagja ennek a csoportnak - és "
"még sok másiknak is! ([Tudj meg többet](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3859,7 +3990,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Adminisztrátorok"
@@ -4758,7 +4889,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr ""
@@ -4986,7 +5117,7 @@ msgid "Unable to save tag."
msgstr ""
#. 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 "Eltiltottak a feliratkozástól."
@@ -5106,185 +5237,185 @@ msgid "Untitled page"
msgstr "Név nélküli oldal"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Elsődleges navigáció"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Kapcsolódás"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, 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:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "A webhely híre"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Másodlagos navigáció"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Súgó"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Névjegy"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "GyIK"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Felhasználási feltételek"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Forrás"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kapcsolat"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "A StatusNet szoftver licence"
@@ -5292,7 +5423,7 @@ msgstr "A StatusNet szoftver licence"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5300,7 +5431,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5309,7 +5440,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5318,50 +5449,50 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "A webhely tartalmára vonatkozó licenc"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Utána"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Előtte"
@@ -5501,12 +5632,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5589,11 +5720,6 @@ msgstr "Írható-olvasható"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Mégse"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5620,11 +5746,6 @@ msgstr ""
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Csatolmányok"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6044,14 +6165,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Kapcsolatok"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -6808,24 +6929,24 @@ msgstr "Megbök"
msgid "Send a nudge to this user"
msgstr "Bökjük meg ezt a felhasználót"
-#: lib/oauthstore.php:283
+#: 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 ""
@@ -7176,17 +7297,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7194,12 +7315,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7207,12 +7328,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7220,12 +7341,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7233,7 +7354,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 3bd8775bf..a7fefd1ae 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:49+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:45+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -90,14 +90,15 @@ msgstr "Salveguardar"
msgid "No such page."
msgstr "Pagina non existe."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -199,12 +200,13 @@ msgstr "Tu e amicos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualisationes de %1$s e su amicos in %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -231,7 +233,7 @@ msgstr "Methodo API non trovate."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -307,43 +309,61 @@ msgstr "Le blocada del usator ha fallite."
msgid "Unblock user failed."
msgstr "Le disblocada del usator ha fallite."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Messages directe de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Tote le messages directe inviate de %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Messages directe a %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Tote le messages directe inviate a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Message sin texto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Isto es troppo longe. Le maximo es %d characteres."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Isto es troppo longe. Le maximo es %d characteres."
+msgstr[1] "Isto es troppo longe. Le maximo es %d characteres."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Usator destinatario non trovate."
-#: 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 "Non pote inviar messages directe a usatores que non es tu amicos."
+#. 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 ""
+"Non invia un message a te mesme; il suffice sussurar lo a te mesme in su "
+"loco."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -523,15 +543,21 @@ msgstr "gruppos in %s"
msgid "Upload failed."
msgstr "Le incargamento ha fallite."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Indicio de identification invalide specificate."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Nulle parametro oauth_token fornite."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Indicio invalide."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -549,39 +575,25 @@ msgstr "Indicio invalide."
msgid "There was a problem with your session token. Try again, please."
msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nomine de usator o contrasigno invalide!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Error del base de datos durante le deletion del usator del application OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Error del base de datos durante le insertion del usator del application "
"OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Le indicio de requesta %s ha essite autorisate. Per favor excambia lo pro un "
-"indicio de accesso."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Le indicio de requesta %s ha essite refusate e revocate."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -590,15 +602,15 @@ msgstr "Le indicio de requesta %s ha essite refusate e revocate."
msgid "Unexpected form submission."
msgstr "Submission de formulario inexpectate."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Un application vole connecter se a tu conto"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permitter o refusar accesso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -610,11 +622,11 @@ msgstr ""
"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Conto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -623,23 +635,47 @@ msgid "Nickname"
msgstr "Pseudonymo"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Contrasigno"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Refusar"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancellar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permitter"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permitter o refusar accesso al informationes de tu conto."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Confirmation de messageria instantanee cancellate."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Le indicio de requesta %s ha essite refusate e revocate."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Tu non es autorisate."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Iste methodo require un commando POST o DELETE."
@@ -805,7 +841,8 @@ msgid "Preview"
msgstr "Previsualisation"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Deler"
@@ -861,12 +898,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -879,12 +917,13 @@ msgstr "Non blocar iste usator"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
@@ -899,9 +938,12 @@ msgstr "Blocar iste usator"
msgid "Failed to save block information."
msgstr "Falleva de salveguardar le information del blocada."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1027,7 +1069,7 @@ msgstr "Tu non es le proprietario de iste application."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1055,6 +1097,67 @@ msgstr "Non deler iste application"
msgid "Delete this application"
msgstr "Deler iste application"
+#. 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 "Tu debe aperir un session pro quitar un gruppo."
+
+#. 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 "Nulle pseudonymo o 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 "Tu non es membro de iste gruppo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Non poteva actualisar gruppo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s quitava le gruppo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Deler usator"
+
+#: 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 ""
+"Es tu secur de voler deler iste usator? Isto radera tote le datos super le "
+"usator del base de datos, sin copia de reserva."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Non deler iste nota"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Deler iste usator"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1131,55 +1234,65 @@ msgstr "Apparentia"
msgid "Design settings for this StatusNet site"
msgstr "Configuration del apparentia de iste sito StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL de logotypo invalide."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL de logotypo invalide."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Thema non disponibile: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Cambiar logotypo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logotypo del sito"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logotypo del sito"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Cambiar thema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Thema del sito"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Le thema de apparentia pro le sito."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Apparentia personalisate"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Es possibile incargar un apparentia personalisate de StatusNet in un "
"archivo .ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar imagine de fundo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1189,66 +1302,66 @@ msgstr ""
"file es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Active"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Non active"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o disactivar le imagine de fundo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tegular le imagine de fundo"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contento"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Ligamines"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avantiate"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalisate"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinitiones"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar apparentias predefinite"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1258,7 +1371,7 @@ msgstr "Revenir al predefinitiones"
msgid "Save"
msgstr "Salveguardar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Salveguardar apparentia"
@@ -1731,7 +1844,7 @@ msgstr "Non poteva converter le indicio de requesta in un indicio de accesso."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le servicio remote usa un version incognite del protocollo OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Error durante le actualisation del profilo remote."
@@ -2328,10 +2441,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nulle pseudonymo o ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2578,6 +2687,11 @@ msgstr "Tu non pote inviar un message a iste usator."
msgid "No content!"
msgstr "Nulle contento!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Isto es troppo longe. Le maximo es %d characteres."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Nulle destinatario specificate."
@@ -2742,7 +2856,7 @@ msgstr "Solmente le URLs %s es permittite super HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2891,147 +3005,166 @@ msgstr "Camminos"
msgid "Path and server settings for this StatusNet site"
msgstr "Configuration de cammino e servitor pro iste sito StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Directorio de thema non legibile: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Directorio de avatar non scriptibile: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Directorio de fundo non scriptibile: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Directorio de localitates non scriptibile: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Servitor SSL invalide. Le longitude maximal es 255 characteres."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Sito"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servitor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nomine de host del servitor del sito."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Cammino"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Cammino del sito"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Cammino al localitates"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directorio del themas"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Cammino al directorio de localitates"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URLs de luxo"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Thema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servitor de themas"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Le thema de apparentia pro le sito."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Cammino al themas"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servitor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Cammino del sito"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directorio del themas"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Cammino al directorio de localitates"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servitor de avatares"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Cammino al avatares"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directorio del avatares"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fundos"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servitor de fundos"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Cammino al fundos"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directorio al fundos"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Annexos"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nunquam"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Alcun vices"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servitor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servitor verso le qual diriger le requestas SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Salveguardar camminos"
@@ -3798,7 +3931,7 @@ msgstr "Organisation"
msgid "Description"
msgstr "Description"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statisticas"
@@ -3941,45 +4074,45 @@ msgstr "Aliases"
msgid "Group actions"
msgstr "Actiones del gruppo"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Syndication de notas pro le gruppo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Amico de un amico pro le gruppo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Nulle)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Tote le membros"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Create"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3994,7 +4127,7 @@ msgstr ""
"lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir "
"parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4007,7 +4140,7 @@ msgstr ""
"[StatusNet](http://status.net/). Su membros condivide breve messages super "
"lor vita e interesses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administratores"
@@ -4963,7 +5096,7 @@ msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Version"
@@ -5199,7 +5332,7 @@ msgid "Unable to save tag."
msgstr "Impossibile salveguardar le etiquetta."
#. 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 "Tu ha essite blocate del subscription."
@@ -5319,185 +5452,185 @@ msgid "Untitled page"
msgstr "Pagina sin titulo"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navigation primari del sito"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personal e chronologia de amicos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connecter a servicios"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Connecter"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modificar le configuration del sito"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invitar amicos e collegas a accompaniar te in %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Invitar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar le session del sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Clauder session"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crear un conto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Crear conto"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Authenticar te a iste sito"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Aperir session"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Adjuta me!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Adjuta"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cercar personas o texto"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Cercar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Aviso del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vistas local"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Aviso de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navigation secundari del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Adjuta"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "A proposito"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "CdS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Confidentialitate"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contacto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licentia del software StatusNet"
@@ -5505,7 +5638,7 @@ msgstr "Licentia del software StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5515,7 +5648,7 @@ msgstr ""
"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** es un servicio de microblog."
@@ -5524,7 +5657,7 @@ msgstr "**%%site.name%%** es un servicio de microblog."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5536,51 +5669,51 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licentia del contento del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contento e datos de %1$s es private e confidential."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
#. 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Pagination"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Post"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Ante"
@@ -5724,12 +5857,12 @@ msgid "Could not authenticate you."
msgstr "Non poteva authenticar te."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Tentava revocar un indicio non cognoscite."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Falleva de deler le indicio revocate."
@@ -5814,11 +5947,6 @@ msgstr ""
"Accesso predefinite pro iste application: lectura solmente, o lectura e "
"scriptura"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancellar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5845,11 +5973,6 @@ msgstr "Revocar"
msgid "author element must contain a name element."
msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Annexos"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6312,14 +6435,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Actualisationes per SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexiones"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Applicationes autorisate connectite"
@@ -7119,24 +7242,24 @@ msgstr "Pulsar"
msgid "Send a nudge to this user"
msgstr "Inviar un pulsata a iste usator"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Error durante le insertion del nove profilo."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Error durante le insertion del avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Error durante le insertion del profilo remote."
#. 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 "Nota duplicate."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Non poteva inserer nove subscription."
@@ -7495,17 +7618,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7513,12 +7636,12 @@ msgstr[0] "un minuta"
msgstr[1] "%d minutas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7526,12 +7649,12 @@ msgstr[0] "un hora"
msgstr[1] "%d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7539,12 +7662,12 @@ msgstr[0] "un die"
msgstr[1] "%d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7552,7 +7675,7 @@ msgstr[0] "un mense"
msgstr[1] "%d menses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 14ec3cdc3..3b6cd6deb 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:51+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:46+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -98,14 +98,15 @@ msgstr "Vista"
msgid "No such page."
msgstr "Ekkert þannig merki."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -200,12 +201,13 @@ msgstr "%s og vinirnir"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Færslur frá %1$s og vinum á %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,43 +311,61 @@ msgstr "Mistókst að loka á notanda."
msgid "Unblock user failed."
msgstr "Mistókst að opna fyrir notanda."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, fuzzy, php-format
msgid "Direct messages from %s"
msgstr "Bein skilaboð til %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Öll bein skilaboð send frá %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Bein skilaboð til %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Öll bein skilaboð til %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Enginn texti í skilaboðum!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Þetta er of langt. Hámarkslengd babls er %d tákn."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Þetta er of langt. Hámarkslengd babls er %d tákn."
+msgstr[1] "Þetta er of langt. Hámarkslengd babls er %d tákn."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Móttakandi fannst ekki."
-#: 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 "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
+#. 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 ""
+"Ekki senda þér skilaboð. Þú getur sagt þetta í hljóði við sjálfa(n) þig í "
+"staðinn."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -537,16 +557,21 @@ msgstr "Hópsaðgerðir"
msgid "Upload failed."
msgstr "Misheppnuð skipun"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ótækt bablinnihald"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "Ótæk stærð."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -564,37 +589,25 @@ msgstr "Ótæk stærð."
msgid "There was a problem with your session token. Try again, please."
msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "Ótækt notendanafn eða lykilorð."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Villa kom upp í stillingu notanda."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -603,15 +616,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Bjóst ekki við innsendingu eyðublaðs."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -620,11 +633,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Aðgangur"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -633,22 +646,45 @@ msgid "Nickname"
msgstr "Stuttnefni"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lykilorð"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr ""
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Hætta við"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
#, fuzzy
msgid "Allow"
msgstr "Allt"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Enginn staðfestingarlykill."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Þú ert ekki áskrifandi."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -814,7 +850,8 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Eyða"
@@ -870,12 +907,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Athugasemd"
@@ -889,12 +927,13 @@ msgstr "Opna á þennan notanda"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -910,9 +949,12 @@ msgstr "Loka á þennan notanda"
msgid "Failed to save block information."
msgstr "Mistókst að vista upplýsingar um notendalokun"
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1043,7 +1085,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -1070,6 +1112,65 @@ msgstr "Get ekki eytt þessu babli."
msgid "Delete this application"
msgstr "Eyða þessu babli"
+#. 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 "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
+
+#. 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 "Ekkert stuttnefni."
+
+#. 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 "Þú ert ekki meðlimur í þessum hópi."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Gat ekki uppfært hóp."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "Staða %1$s á %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Eyða"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Get ekki eytt þessu babli."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Eyða þessu babli"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1147,59 +1248,69 @@ msgstr ""
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ótæk stærð."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Ótæk stærð."
+
+#: actions/designadminpanel.php:341
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
#, fuzzy
msgid "Change logo"
msgstr "Breyta"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Babl vefsíðunnar"
+
+#: actions/designadminpanel.php:466
#, fuzzy
msgid "Change theme"
msgstr "Breyta"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
#, fuzzy
msgid "Site theme"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
#, fuzzy
msgid "Theme for the site."
msgstr "Skrá þig út af síðunni"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1207,70 +1318,70 @@ msgid ""
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Breyta lykilorðinu þínu"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "Tengjast"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Leita"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texti"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Innskráning"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1280,7 +1391,7 @@ msgstr ""
msgid "Save"
msgstr "Vista"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1772,7 +1883,7 @@ msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Óþekkt útgáfa OMB samskiptamátans."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
@@ -2375,11 +2486,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Ekkert stuttnefni."
-
#: actions/joingroup.php:141
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
@@ -2633,6 +2739,11 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð."
msgid "No content!"
msgstr "Ekkert innihald!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd babls er %d tákn."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Enginn móttökuaðili tilgreindur."
@@ -2795,7 +2906,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2950,157 +3061,173 @@ msgstr ""
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, fuzzy, php-format
msgid "Avatar directory not writable: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Þessi síða er ekki aðgengileg í "
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
#, fuzzy
msgid "Site"
msgstr "Bjóða"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
#, fuzzy
msgid "Server"
msgstr "Endurheimta"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
#, fuzzy
msgid "Site path"
msgstr "Babl vefsíðunnar"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
+#: actions/pathsadminpanel.php:247
+msgid "Locale Directory"
msgstr ""
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Skrá þig út af síðunni"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+#, fuzzy
+msgid "SSL server"
+msgstr "Endurheimta"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Babl vefsíðunnar"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+msgid "Directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatars"
msgstr "Mynd"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
#, fuzzy
msgid "Avatar server"
msgstr "Stillingar fyrir mynd"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "Mynd hefur verið uppfærð."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr ""
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
msgstr ""
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
#, fuzzy
msgid "Never"
msgstr "Endurheimta"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
#, fuzzy
msgid "Sometimes"
msgstr "Babl"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Endurheimta"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Babl vefsíðunnar"
@@ -3870,7 +3997,7 @@ msgstr "Uppröðun"
msgid "Description"
msgstr "Lýsing"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Tölfræði"
@@ -4004,46 +4131,46 @@ msgstr ""
msgid "Group actions"
msgstr "Hópsaðgerðir"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "%s hópurinn"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Meðlimir"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ekkert)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Allir meðlimir"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
#, fuzzy
msgid "Created"
msgstr "Í sviðsljósinu"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4053,7 +4180,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4062,7 +4189,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
#, fuzzy
msgid "Admins"
msgstr "Stjórnandi"
@@ -5011,7 +5138,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
#, fuzzy
msgid "Version"
msgstr "Persónulegt"
@@ -5254,7 +5381,7 @@ msgid "Unable to save tag."
msgstr "Gat ekki vistað merki."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
@@ -5379,44 +5506,44 @@ msgid "Untitled page"
msgstr "Ónafngreind síða"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Persónulegt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Breyta lykilorðinu þínu"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Tengjast"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
@@ -5424,84 +5551,84 @@ msgstr "Stikl aðalsíðu"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Stjórnandi"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Bjóða"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Skrá þig inn á síðuna"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Einkennismerki"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Búa til nýjan hóp"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Nýskrá"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Innskráning"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjálp"
-#: lib/action.php:509
+#: lib/action.php:537
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Hjálp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5509,68 +5636,68 @@ msgstr "Leita"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Babl vefsíðunnar"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Staðbundin sýn"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Babl síðunnar"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Hjálp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Um"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Spurt og svarað"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Friðhelgi"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Frumþula"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Tengiliður"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "Pot"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
@@ -5578,7 +5705,7 @@ msgstr "Hugbúnaðarleyfi StatusNet"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5588,7 +5715,7 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er örbloggsþjónusta."
@@ -5597,7 +5724,7 @@ msgstr "**%%site.name%%** er örbloggsþjónusta."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5609,51 +5736,51 @@ msgstr ""
"licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Uppröðun"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Eftir"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Áður"
@@ -5807,12 +5934,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5898,11 +6025,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Hætta við"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5929,11 +6051,6 @@ msgstr "Endurheimta"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr ""
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6363,14 +6480,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Færslur sendar með SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Tengjast"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -7077,24 +7194,24 @@ msgstr "Pot"
msgid "Send a nudge to this user"
msgstr "Ýta við þessum notanda"
-#: lib/oauthstore.php:283
+#: 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 "Gat ekki sett inn nýja áskrift."
@@ -7462,17 +7579,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7480,12 +7597,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7493,12 +7610,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7506,12 +7623,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7519,7 +7636,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 2b9591990..32e749ad8 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:52+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:47+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -94,14 +94,15 @@ msgstr "Salva"
msgid "No such page."
msgstr "Pagina inesistente."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "Tu e i tuoi amici"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Messaggi da %1$s e amici su %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "Metodo delle API non trovato."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,43 +311,61 @@ msgstr "Blocco dell'utente non riuscito."
msgid "Unblock user failed."
msgstr "Sblocco dell'utente non riuscito."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Messaggi diretti da %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Tutti i messaggi diretti inviati da %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Messaggi diretti a %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Tutti i messaggi diretti inviati a %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Nessun testo nel messaggio!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
-
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] ""
+"Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
+msgstr[1] ""
+"Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Destinatario non trovato."
-#: 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 "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
+#. 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 "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -527,15 +547,21 @@ msgstr "Gruppi su %s"
msgid "Upload failed."
msgstr "Caricamento non riuscito."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Token di accesso specificato non valido."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Nessun parametro oauth_token fornito."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Token non valido."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -554,36 +580,22 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nome utente o password non valido."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Errore nel database nell'eliminare l'applicazione utente OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Il token di richiesta %s è stato autorizzato. Scambiarlo con un token di "
-"accesso."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Il token di richiesta %s è stato rifiutato o revocato."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -592,15 +604,15 @@ msgstr "Il token di richiesta %s è stato rifiutato o revocato."
msgid "Unexpected form submission."
msgstr "Invio del modulo inaspettato."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Un'applicazione vorrebbe collegarsi al tuo account"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Consenti o nega l'accesso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -612,11 +624,11 @@ msgstr ""
"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Account"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -625,23 +637,47 @@ msgid "Nickname"
msgstr "Soprannome"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Password"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Nega"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Annulla"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Consenti"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Consenti o nega l'accesso alle informazioni del tuo account."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Conferma della messaggistica annullata."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Il token di richiesta %s è stato rifiutato o revocato."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Autorizzazione non presente."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Questo metodo richiede POST o DELETE."
@@ -804,7 +840,8 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Elimina"
@@ -860,12 +897,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -878,12 +916,13 @@ msgstr "Non bloccare questo utente"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sì"
@@ -898,9 +937,12 @@ msgstr "Blocca questo utente"
msgid "Failed to save block information."
msgstr "Salvataggio delle informazioni per il blocco non riuscito."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1026,7 +1068,7 @@ msgstr "Questa applicazione non è di tua proprietà."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1053,6 +1095,67 @@ msgstr "Non eliminare l'applicazione"
msgid "Delete this application"
msgstr "Elimina l'applicazione"
+#. 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 "Devi eseguire l'accesso per lasciare un gruppo."
+
+#. 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 "Nessun soprannome o 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 "Non fai parte di questo gruppo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Impossibile aggiornare il gruppo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ha lasciato il gruppo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Elimina utente"
+
+#: 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 ""
+"Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati "
+"dell'utente dal database, senza una copia di sicurezza."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Non eliminare il messaggio"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Elimina questo utente"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1129,53 +1232,63 @@ msgstr "Aspetto"
msgid "Design settings for this StatusNet site"
msgstr "Impostazioni dell'aspetto per questo sito StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL del logo non valido."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL del logo non valido."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema non disponibile: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Modifica logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo del sito"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo del sito"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Modifica tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema del sito"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema per questo sito."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Tema personalizzato"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Puoi caricare un tema per StatusNet personalizzato come un file ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Modifica l'immagine di sfondo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Sfondo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1185,66 +1298,66 @@ msgstr ""
"file è di %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Abilita o disabilita l'immagine di sfondo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Affianca l'immagine di sfondo"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifica colori"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Contenuto"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra laterale"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Testo"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Collegamenti"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avanzate"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalizzato"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usa predefiniti"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Ripristina i valori predefiniti"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1254,7 +1367,7 @@ msgstr "Reimposta i valori predefiniti"
msgid "Save"
msgstr "Salva"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Salva aspetto"
@@ -1731,7 +1844,7 @@ msgstr "Impossibile convertire il token di richiesta in uno di accesso."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Errore nell'aggiornare il profilo remoto."
@@ -2327,10 +2440,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nessun soprannome o ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2575,6 +2684,11 @@ msgstr "Non puoi inviare un messaggio a questo utente."
msgid "No content!"
msgstr "Nessun contenuto!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Nessun destinatario specificato."
@@ -2736,7 +2850,7 @@ msgstr "Solo URL %s attraverso HTTP semplice."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2886,147 +3000,166 @@ msgstr "Percorsi"
msgid "Path and server settings for this StatusNet site"
msgstr "Percorso e impostazioni del server per questo sito StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Directory del tema non leggibile: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Directory delle immagini degli utenti non scrivibile: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Directory degli sfondi non scrivibile: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Directory delle localizzazioni non leggibile: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Sito"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nome host del server"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Percorso"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Percorso del sito"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Percorso alle localizzazioni"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directory del tema"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Percorso della directory alle localizzazioni"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URL semplici"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Server del tema"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema per questo sito."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Percorso del tema"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Server SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Percorso del sito"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directory del tema"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Percorso della directory alle localizzazioni"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Immagini"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Server dell'immagine"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Percorso dell'immagine"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directory dell'immagine"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Sfondi"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Server dello sfondo"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Percorso dello sfondo"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directory dello sfondo"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Allegati"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Mai"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Qualche volta"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Usa SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quando usare SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Server SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Server a cui dirigere le richieste SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Salva percorsi"
@@ -3792,7 +3925,7 @@ msgstr "Organizzazione"
msgid "Description"
msgstr "Descrizione"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistiche"
@@ -3933,45 +4066,45 @@ msgstr "Alias"
msgid "Group actions"
msgstr "Azioni dei gruppi"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Feed dei messaggi per il gruppo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF per il gruppo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membri"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(nessuno)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Tutti i membri"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Creato"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3987,7 +4120,7 @@ msgstr ""
"stesso](%%%%action.register%%%%) per far parte di questo gruppo e di molti "
"altri! ([Maggiori informazioni](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3999,7 +4132,7 @@ msgstr ""
"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
"[StatusNet](http://status.net/)."
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Amministratori"
@@ -4954,7 +5087,7 @@ msgid "Plugins"
msgstr "Plugin"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versione"
@@ -5193,7 +5326,7 @@ msgid "Unable to save tag."
msgstr "Impossibile salvare l'etichetta."
#. 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 "Non ti è possibile abbonarti."
@@ -5313,185 +5446,185 @@ msgid "Untitled page"
msgstr "Pagina senza nome"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personale"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Connetti"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Amministra"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Invita"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Esci"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Crea un account"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrati"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Accedi"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Aiuto"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Messaggio del sito"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Viste locali"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Pagina messaggio"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Aiuto"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Informazioni"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Sorgenti"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contatti"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Badge"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
@@ -5499,7 +5632,7 @@ msgstr "Licenza del software StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5509,7 +5642,7 @@ msgstr ""
"(%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** è un servizio di microblog."
@@ -5518,7 +5651,7 @@ msgstr "**%%site.name%%** è un servizio di microblog."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5530,27 +5663,27 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -5558,7 +5691,7 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5566,19 +5699,19 @@ msgstr ""
"licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginazione"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Successivi"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Precedenti"
@@ -5720,12 +5853,12 @@ msgid "Could not authenticate you."
msgstr "Impossibile autenticarti."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Tentativo di revocare un token sconosciuto."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Eliminazione del token revocato non riuscita."
@@ -5809,11 +5942,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Annulla"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5840,11 +5968,6 @@ msgstr "Revoca"
msgid "author element must contain a name element."
msgstr "L'elemento author deve contenere un elemento name."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Allegati"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6311,14 +6434,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Messaggi via SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connessioni"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Applicazioni collegate autorizzate"
@@ -7119,24 +7242,24 @@ msgstr "Richiama"
msgid "Send a nudge to this user"
msgstr "Invia un richiamo a questo utente"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Errore nell'inserire il nuovo profilo."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Errore nell'inserire l'immagine."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Errore nell'inserire il profilo remoto."
#. 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 "Messaggio duplicato."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Impossibile inserire un nuovo abbonamento."
@@ -7492,17 +7615,17 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7510,12 +7633,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7523,12 +7646,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7536,12 +7659,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7549,7 +7672,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:1184
+#: lib/util.php:1194
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 e371c8856..94bb1d17a 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:54+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:48+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -94,14 +94,15 @@ msgstr "保存"
msgid "No such page."
msgstr "そのようなタグはありません。"
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "あなたと友人"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s に %1$s と友人からの更新があります!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "API メソッドが見つかりません。"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -310,43 +312,59 @@ msgstr "ユーザのブロックに失敗しました。"
msgid "Unblock user failed."
msgstr "ユーザのブロック解除に失敗しました。"
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "%s からのダイレクトメッセージ"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s から送られた全てのダイレクトメッセージ"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "%s へのダイレクトメッセージ"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%s へ送った全てのダイレクトメッセージ"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "メッセージの本文がありません!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "長すぎます。メッセージは最大 %d 字までです。"
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 字までです。"
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "受け取り手のユーザが見つかりません。"
-#: 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 "友人でないユーザにダイレクトメッセージを送ることはできません。"
+#. 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 ""
+"自分自身にメッセージを送ることはできません; かわりに独り言を言いましょう。"
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -531,15 +549,21 @@ msgstr "%s 上のグループ"
msgid "Upload failed."
msgstr "ファイルアップロード"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "不正なログイントークンが指定されています。"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "oauth_token パラメータは提供されませんでした。"
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "不正なトークン。"
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -557,36 +581,22 @@ msgstr "不正なトークン。"
msgid "There was a problem with your session token. Try again, please."
msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "不正なユーザ名またはパスワード。"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "OAuth アプリケーションユーザの削除時DBエラー。"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "OAuth アプリケーションユーザの追加時DBエラー。"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"リクエストトークン %s は承認されました。 アクセストークンとそれを交換してくだ"
-"さい。"
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -595,15 +605,15 @@ msgstr "リクエストトークン%sは、拒否されて、取り消されま
msgid "Unexpected form submission."
msgstr "予期せぬフォーム送信です。"
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "アプリケーションはあなたのアカウントに接続したいです"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "アクセスを許可または拒絶"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -612,11 +622,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "アカウント"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -625,23 +635,47 @@ msgid "Nickname"
msgstr "ニックネーム"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "パスワード"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "拒絶"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "中止"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "許可"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "アカウント情報へのアクセスを許可するか、または拒絶してください。"
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "確認コードがありません。"
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "リクエストトークン%sは、拒否されて、取り消されました。"
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "認証されていません。"
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "このメソッドには POST か DELETE が必要です。"
@@ -802,7 +836,8 @@ msgid "Preview"
msgstr "プレビュー"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "削除"
@@ -860,12 +895,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "ノート"
@@ -878,12 +914,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -899,9 +936,12 @@ msgstr "このユーザをブロックする"
msgid "Failed to save block information."
msgstr "ブロック情報の保存に失敗しました。"
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1027,7 +1067,7 @@ msgstr "このアプリケーションのオーナーではありません。"
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1055,6 +1095,68 @@ msgstr "このアプリケーションを削除しないでください"
msgid "Delete this application"
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 "グループから離れるにはログインしていなければなりません。"
+
+#. 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 "ニックネームがありません。"
+
+#. 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 "このグループのメンバーではありません。"
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s はグループ %2$s に残りました。"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "ユーザ削除"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "このつぶやきを削除できません。"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "このユーザを削除"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1131,54 +1233,64 @@ msgstr "デザイン"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "不正なロゴ URL"
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "不正なロゴ URL"
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "IM が利用不可。"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "ロゴの変更"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "サイトロゴ"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "サイトロゴ"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "テーマ変更"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "サイトテーマ"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "サイトのテーマ"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "サイトテーマ"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "バックグラウンドイメージの変更"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "バックグラウンド"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1188,66 +1300,66 @@ msgstr ""
"イズは %1$s。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "オン"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "オフ"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "バックグラウンドイメージのオンまたはオフ。"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "タイルバックグラウンドイメージ"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "色の変更"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "サイドバー"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "テキスト"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "リンク"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "デフォルトを使用"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "デフォルトデザインに戻す。"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "デフォルトへリセットする"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1257,7 +1369,7 @@ msgstr "デフォルトへリセットする"
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "デザインの保存"
@@ -1739,7 +1851,7 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
"リモートサービスは、不明なバージョンの OMB プロトコルを使用しています。"
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "リモートプロファイル更新エラー"
@@ -2339,11 +2451,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "グループに入るためにはログインしなければなりません。"
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "ニックネームがありません。"
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2587,6 +2694,11 @@ msgstr "このユーザにメッセージを送ることはできません。"
msgid "No content!"
msgstr "コンテンツがありません!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "長すぎます。メッセージは最大 %d 字までです。"
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "受取人が書かれていません。"
@@ -2749,7 +2861,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "サポートされていないデータ形式。"
@@ -2899,147 +3011,166 @@ msgstr "パス"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "テーマディレクトリ"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "アバターディレクトリ"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "バックグラウンドディレクトリ"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "場所ディレクトリが読み込めません: %s"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "不正な SSL サーバー。最大 255 文字まで。"
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "サイト"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "サーバー"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "サイトのサーバーホスト名"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "パス"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "サイトパス"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "ロケールのパス"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "テーマディレクトリ"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "ロケールへのディレクトリパス"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Fancy URL (読みやすく忘れにくい) を使用しますか?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "テーマ"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "テーマサーバー"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "サイトのテーマ"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSLサーバ"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "テーマパス"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "サイトパス"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "テーマディレクトリ"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "ロケールへのディレクトリパス"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "アバター"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "アバターサーバー"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "アバターパス"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "アバターディレクトリ"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "バックグラウンド"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "バックグラウンドサーバー"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "バックグラウンドパス"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "バックグラウンドディレクトリ"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "添付"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr ""
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "ときどき"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "いつも"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL 使用"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "SSL 使用時"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSLサーバ"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "ダイレクト SSL リクエストを向けるサーバ"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "保存パス"
@@ -3802,7 +3933,7 @@ msgstr "組織"
msgid "Description"
msgstr "概要"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "統計データ"
@@ -3945,45 +4076,45 @@ msgstr "別名"
msgid "Group actions"
msgstr "グループアクション"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s グループのつぶやきフィード (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s グループのつぶやきフィード (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s グループのつぶやきフィード (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "%s グループの FOAF"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "メンバー"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "全てのメンバー"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "作成日"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3998,7 +4129,7 @@ msgstr ""
"する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ"
"のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4011,7 +4142,7 @@ msgstr ""
"wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関"
"する短いメッセージを共有します。"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "管理者"
@@ -4970,7 +5101,7 @@ msgid "Plugins"
msgstr "プラグイン"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "バージョン"
@@ -5209,7 +5340,7 @@ msgid "Unable to save tag."
msgstr "タグをを保存できません。"
#. 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 "あなたはフォローが禁止されました。"
@@ -5330,126 +5461,126 @@ msgid "Untitled page"
msgstr "名称未設定ページ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
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:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "パーソナル"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "パスワードの変更"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "接続"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "管理者"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "友人や同僚が %s で加わるよう誘ってください。"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "招待"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "サイトのテーマ"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "ロゴ"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "新しいグループを作成"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "登録"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "ログイン"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "ヘルプ"
-#: lib/action.php:509
+#: lib/action.php:537
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "もっとグループを検索"
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5457,67 +5588,67 @@ msgstr "検索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "サイトつぶやき"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "ローカルビュー"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "ページつぶやき"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "ヘルプ"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "About"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "よくある質問"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "プライバシー"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "ソース"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "連絡先"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "バッジ"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
@@ -5525,7 +5656,7 @@ msgstr "StatusNet ソフトウェアライセンス"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5535,7 +5666,7 @@ msgstr ""
"イクロブログサービスです。 "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -5544,7 +5675,7 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5556,50 +5687,50 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "ページ化"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "前>>"
@@ -5745,12 +5876,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5834,11 +5965,6 @@ msgstr ""
"このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
"ライト"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "中止"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
#, fuzzy
@@ -5867,11 +5993,6 @@ msgstr "回復"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "添付"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6297,14 +6418,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "SMSでの更新"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "接続"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "承認された接続アプリケーション"
@@ -7079,24 +7200,24 @@ msgstr "合図"
msgid "Send a nudge to this user"
msgstr "このユーザへ合図を送る"
-#: lib/oauthstore.php:283
+#: 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 "サブスクリプションを追加できません"
@@ -7452,60 +7573,60 @@ msgid "Moderator"
msgstr "管理"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "数秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "約 1 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, 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:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "約 1 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "約 1 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, 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:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "約 1 ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, 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:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index ca4362803..326318f46 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:55+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:49+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -90,14 +90,15 @@ msgstr "შეინახე"
msgid "No such page."
msgstr "ასეთი გვერდი არ არსებობს."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -197,12 +198,13 @@ msgstr "შენ და მეგობრები"
msgid "Updates from %1$s and friends on %2$s!"
msgstr " %1$s და მეგობრების განახლებები %2$s-ზე!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -229,7 +231,7 @@ msgstr "API მეთოდი ვერ მოიძებნა."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -305,43 +307,58 @@ msgstr "მომხმარებლის დაბლოკვა ვერ
msgid "Unblock user failed."
msgstr "ვერ მოხერხდა მომხმარებელზე ბლოკის მოხსნა."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "პირდაპირი შეტყობინებები %s-სგან"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s-ს მიერ გამოგზავნილი ყველა პირდაპირი შეტყობინება"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "%s-სთვის გაგზავნილი პირდაპირი შეტყობინებები"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%s-სთვის გაგზავნილი ყველა პირდაპირი შეტყობინება"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "შეტყობინების ტექსტი არ არის!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "ეს ძალიან გრძელია. შეტყობინებაში დასაშვებია %d სიმბოლო."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 სიმბოლო."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "მიმღები მომხმარებელი ვერ მოიძებნა."
-#: 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 "ვერ გაუგზავნი პირდაპირ შეტყობინებას იმას, ვისთანაც არ მეგობრობ."
+#. 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 "ნუ გაუგზავნი შეტყობინებას საკუთარ თავს; უბრალოდ ჩუმად ჩაუჩურჩულე."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -521,15 +538,20 @@ msgstr "ჯგუფები %s-ზე"
msgid "Upload failed."
msgstr "ატვირთვა ვერ მოხერხდა."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+msgid "Invalid request token or verifier."
+msgstr ""
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "oauth_token პარამეტრი არ არის მოწოდებული."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
-msgstr ""
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
+msgstr "არასწორი როლი."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -547,34 +569,22 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "არასწორი მეტსახელი / პაროლი!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლიკაციის მომხმარებლის წაშლისას."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლიკაციის მომხმარებლის ჩასმისას."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -583,15 +593,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr ""
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "აპლიკაციას უნდა რომ დაუკავშირდეს თქვენს ანგარიშს"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "დოუშვი ან აკრძალე შესვლა"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -600,11 +610,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "ანგარიში"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -613,23 +623,47 @@ msgid "Nickname"
msgstr "მეტსახელი"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "პაროლი"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "აკრძალვა"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "გაუქმება"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "დაშვება"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "დაუშვი ან აკრძალე წვდომა თქვენი ანგარიშის ინფორმაციაზე."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM დასტური გაუქმდა."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "თქვენ არ ხართ ავტორიზირებული."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "ეს მეთოდი მოითხოვს POST-ს ან DELETE-ს."
@@ -791,7 +825,8 @@ msgid "Preview"
msgstr "წინასწარი გადახედვა"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "წაშლა"
@@ -844,12 +879,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "არა"
@@ -862,12 +898,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "დიახ"
@@ -882,9 +919,12 @@ msgstr "დაბლოკე ეს მომხმარებელი"
msgid "Failed to save block information."
msgstr "დაბლოკვის შესახებ ინფორმაციის შენახვა ვერ მოხერხდა."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1010,7 +1050,7 @@ msgstr "თქვენ არ ხართ ამ აპლიკაციი
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1037,6 +1077,67 @@ msgstr "არ წაშალო ეს აპლიკაცია"
msgid "Delete this application"
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 "გჯუფის დატოვებისათვის საჭიროა ავტორიზაცია."
+
+#. 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 "მეტსახელი ან 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 "თვენ არ ხართ ამ ჯგუფის წევრი."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "მომხმარებლის წაშლა"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "არ წაშალო ეს შეტყობინება"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "ამ მომხმარებლის წაშლა"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1111,54 +1212,64 @@ msgstr "ამ მომხმარებლის წაშლა"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "ლოგოს არასწორი URL-ი"
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "ლოგოს არასწორი URL-ი"
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "იერსახე არ არის ხელმისაწვდომი %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "შეცვალე ლოგო"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "საიტის ლოგო"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "საიტის ლოგო"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "შეცვალე იერსახე"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "საიტის იერსახე"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "იერსახე ამ საიტისთვის"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "საკუთარი იერსახე"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"თქვენ შეგიძლიათ ატვირთოთ საკუთარი StatusNet–იერსახე .ZIP არქივის სახით."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "შეცვალე ფონური სურათი"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "ფონი"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1168,66 +1279,66 @@ msgstr ""
"ზომაა %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "ჩართვა"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "გამორთვა"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "ჩართე ან გამორთე ფონური სურათის ფუნქცია."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "გაამრავლე ფონური სურათი"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "შეცვალე ფერები"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "შიგთავსი"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "გვერდითი პანელი"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "ტექსტი"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "ბმულები"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "მეტი პარამეტრები"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "საკუთარი CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "გამოიყენე პირვანდელი მდგომარეობა"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "დააბრუნე პირვანდელი დიზაინი"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "პირვანდელის პარამეტრების დაბრუნება"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1237,7 +1348,7 @@ msgstr "პირვანდელის პარამეტრების
msgid "Save"
msgstr "შენახვა"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "შეინახე დიზაინი"
@@ -1711,7 +1822,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr "დაშორებული სერვისი OMB პროტოკოლის უცნობ ვერსიას იყენებს."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "შეცდომა დაშორებული პროფილის განახლებისას."
@@ -2307,10 +2418,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "გჯუფში გაწევრიანებისათვის საჭიროა ავტორიზაცია."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "მეტსახელი ან ID უცნობია."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2553,6 +2660,11 @@ msgstr "ამ მომხმარებელს შეტყობინე
msgid "No content!"
msgstr "შიგთავსი არ არის!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "ეს ძალიან გრძელია. შეტყობინებაში დასაშვებია %d სიმბოლო."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "მიმღები მითითებული არ არის."
@@ -2711,7 +2823,7 @@ msgstr "გთხოვთ გამოიყენოთ მხოლოდ %s
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "მონაცემთა ფორმატი მხარდაჭერილი არ არის."
@@ -2861,147 +2973,165 @@ msgstr "გზები"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "იერსახის დირექტორია არ არის წაკითხვადი: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "ავატარის დირექტორია არ არის ჩაწერადი: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "ფონის დირექტორია არ არის ჩაწერადი: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "არასწორი SSL სერვერი. მაქსიმალური სიგრძე არის 255 სიმბოლო."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "საიტი"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "სერვერი"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "საიტის სერვერის ჰოსტის სახელი."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "გზა"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "საიტის გზა"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "იერსახის დირექტორია"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "ლამაზი URL–ები"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "გამოვიყენო ლამაზი (მეტად კითხვადი და დასამახსოვრებელი) URL–ები?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "იერსახე"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "იერსახის სერვერი"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "იერსახე ამ საიტისთვის"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "იერსახის გზა"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL სერვერი"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "საიტის გზა"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "იერსახის დირექტორია"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "ავატარები"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "ავატარების სერვერი"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "ავატარების გზა"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "ავატარების დირექტორია"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "ფონები"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "ფონების სერვერი"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "ფონების გზა"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "ფონების დირექტორია"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "მიმაგრებები"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "არასდროს"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "ზოგჯერ"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "მუდამ"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "გამოიყენე SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "როდის გამოვიყენო SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL სერვერი"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "სერვერი რომელზეც მიემართოს SSL მოთხოვნები"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "გზების დამახსოვრება"
@@ -3763,7 +3893,7 @@ msgstr "ორგანიზაცია"
msgid "Description"
msgstr "აღწერა"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "სტატისტიკა"
@@ -3902,45 +4032,45 @@ msgstr ""
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "წევრები"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr ""
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "შექმნილია"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3950,7 +4080,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3959,7 +4089,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr ""
@@ -4903,7 +5033,7 @@ msgid "Plugins"
msgstr "დამატებები"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "ვერსია"
@@ -5143,7 +5273,7 @@ msgid "Unable to save tag."
msgstr "სანიშნეს დამახსოვრება ვერ ხერხდება."
#. 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 "თქვენ აგეკრძალათ გამოწერა."
@@ -5263,185 +5393,185 @@ msgid "Untitled page"
msgstr "უსათაურო გვერდი"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "საიტის ძირითადი ნავიგაცია"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "პირადი"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "კავშირი"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "ადმინი"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "მოწვევა"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "გასვლა საიტიდან"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "გასვლა"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "გახსენი ანგარიში"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "რეგისტრაცია"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "საიტზე შესვლა"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "შესვლა"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "დამეხმარეთ!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "დახმარება"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "მოძებნე ხალხი ან ტექსტი"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "ძიება"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "საიტის შეტყობინება"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "ლოკალური ხედები"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "გვერდის შეტყობინება"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "საიტის მეორადი ნავიგაცია"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "დახმარება"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "საიტის შესახებ"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "ხდკ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "მპ"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "პირადი"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "წყარო"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "კონტაქტი"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "იარლიყი"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet კოდის ლიცენზია"
@@ -5449,7 +5579,7 @@ msgstr "StatusNet კოდის ლიცენზია"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5459,7 +5589,7 @@ msgstr ""
"(%%site.broughtbyurl%%)-ს მიერ."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -5468,7 +5598,7 @@ msgstr "**%%site.name%%** არის მიკრობლოგინგი
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5480,51 +5610,51 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$s ის შიგთავსი და მონაცემები არის პირადული და კონფიდენციალური."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "შიგთავსი და მონაცემები %1$s-ის საკუთრებაა. ყველა უფლება დაცულია."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "%1$s-ს მთლიანი შიგთავსი და მონაცემები ხელმისაწვდომია %2$s ლიცენზიით."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "გვერდებათ დაყოფა"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "წინა"
@@ -5666,12 +5796,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5755,11 +5885,6 @@ msgstr ""
"შესვლის პირვანდელი მდგომარეობა ამ აპლიკაციისთვის: მხოლოდ წაკითხვადი, ან "
"კითხვა-წერადი"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "გაუქმება"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5786,11 +5911,6 @@ msgstr "უკუგება"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "მიმაგრებები"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6214,14 +6334,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "განახლებები SMS-თ"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "შეერთებები"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "ავტორიზირებული შეერთებული აპლიკაციები"
@@ -7002,24 +7122,24 @@ msgstr ""
msgid "Send a nudge to this user"
msgstr ""
-#: lib/oauthstore.php:283
+#: 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 "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
@@ -7373,60 +7493,60 @@ msgid "Moderator"
msgstr "მოდერატორი"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "რამდენიმე წამის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "დაახლოებით 1 წუთის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, 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:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "დაახლოებით 1 საათის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "დაახლოებით 1 დღის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, 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:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "დაახლოებით 1 თვის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, 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:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "დაახლოებით 1 წლის წინ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 2f21e358f..0c0d1d045 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:56+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:49+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -92,14 +92,15 @@ msgstr "저장"
msgid "No such page."
msgstr "해당하는 페이지 없음"
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -195,12 +196,13 @@ msgstr "당신 및 친구들"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -227,7 +229,7 @@ msgstr "API 메서드 발견 안 됨."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -301,43 +303,59 @@ msgstr "이용자 차단에 실패했습니다."
msgid "Unblock user failed."
msgstr "이용자 차단 해제에 실패했습니다."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "%s으로부터 직접 메시지"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s에서 보낸 모든 직접 메시지"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "%s에게 직접 메시지"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%s에게 모든 직접 메시지"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "메시지 내용이 없습니다!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "너무 깁니다. 최대 메시지 길이는 %d자 까지입니다."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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자 까지입니다."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "받는 사용자가 없습니다."
-#: 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 "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
+#. 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 ""
+"자신에게 메시지를 보내지 마세요. 대신 조용하게 스스로에게 그것을 말하세요;;"
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -520,15 +538,21 @@ msgstr "%s 사이트의 그룹"
msgid "Upload failed."
msgstr "실행 실패"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "허용되지 않는 요청입니다."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "토큰이 잘못되었습니다."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -546,34 +570,22 @@ msgstr "토큰이 잘못되었습니다."
msgid "There was a problem with your session token. Try again, please."
msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "OAuth 응용프로그램 사용자 삭제 중 데이터베이스 오류"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -582,15 +594,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "잘못된 폼 제출"
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "응용 프로그램이 계정에 연결하려고 할 것입니다."
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "접근 허용 또는 거부"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -602,11 +614,11 @@ msgstr ""
"$s 계정의 접근을 허용해야 합니다."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "계정"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -615,23 +627,47 @@ msgid "Nickname"
msgstr "별명"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "비밀 번호"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "거부"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "취소"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "허용"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "계정 정보에 대한 접근을 허용 또는 거부합니다."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "확인 코드가 없습니다."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "이 메서드는 POST 또는 DELETE를 요구합니다."
@@ -792,7 +828,8 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "삭제"
@@ -847,12 +884,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "아니오"
@@ -865,12 +903,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "예"
@@ -885,9 +924,12 @@ msgstr "이 사용자 차단하기"
msgid "Failed to save block information."
msgstr "정보차단을 저장하는데 실패했습니다."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1014,7 +1056,7 @@ msgstr "이 응용프로그램 삭제 않기"
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1039,6 +1081,65 @@ msgstr "이 응용프로그램 삭제 않기"
msgid "Delete this application"
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 "그룹을 떠나기 위해서는 로그인해야 합니다."
+
+#. 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 "별명이 없습니다."
+
+#. 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 "당신은 해당 그룹의 멤버가 아닙니다."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s의 상태 (%2$s에서)"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "이용자 삭제"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "이 통지를 지울 수 없습니다."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "이 사용자 삭제"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1114,53 +1215,63 @@ msgstr "디자인"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "잘못된 로고 URL 입니다."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "잘못된 로고 URL 입니다."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "인스턴트 메신저를 사용할 수 없습니다."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "로고 변경"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "사이트 로고"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "사이트 로고"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "테마 바꾸기"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "사이트 테마"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "사이트에 대한 테마"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "사용자 지정 테마"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "배경 이미지 바꾸기"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "배경"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1169,66 +1280,66 @@ msgstr ""
"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "켜기"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "끄기"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "배경 이미지를 켜거나 끈다."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "배경 이미지를 반복 나열"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "색상 변경"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "만족하는"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "가장자리 창"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "문자"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "링크"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "고급 검색"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "사용자 정의 CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "기본값 사용"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1238,10 +1349,9 @@ msgstr ""
msgid "Save"
msgstr "저장"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
-#, fuzzy
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
-msgstr "프로필 디자인"
+msgstr "디자인 저장"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -1712,7 +1822,7 @@ msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB 프로토콜의 알려지지 않은 버전"
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "리모트 프로필 업데이트 오류"
@@ -2289,11 +2399,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "그룹가입을 위해서는 로그인이 필요합니다."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "별명이 없습니다."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2372,7 +2477,7 @@ msgstr "크리에이티브 커먼즈 (Creative Commons)"
#: actions/licenseadminpanel.php:252
msgid "Type"
-msgstr ""
+msgstr "종류"
#: actions/licenseadminpanel.php:254
msgid "Select license"
@@ -2380,7 +2485,7 @@ msgstr "라이선스 선택"
#: actions/licenseadminpanel.php:268
msgid "License details"
-msgstr ""
+msgstr "라이선스 세부 정보"
#: actions/licenseadminpanel.php:274
msgid "Owner"
@@ -2539,6 +2644,11 @@ msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
msgid "No content!"
msgstr "내용이 없습니다!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "너무 깁니다. 최대 메시지 길이는 %d자 까지입니다."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "수신자를 지정하지 않았습니다."
@@ -2666,13 +2776,12 @@ msgid "Unable to revoke access for app: %s."
msgstr ""
#: actions/oauthconnectionssettings.php:198
-#, fuzzy
msgid "You have not authorized any applications to use your account."
-msgstr "다음 응용 프로그램이 계정에 접근하도록 허용되어 있습니다."
+msgstr "계정에서 사용하도록 허용한 응용 프로그램이 없습니다."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
-msgstr ""
+msgstr "개발자는 자기 응용 프로그램의 등록 정보를 편집할 수 있습니다"
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
@@ -2697,7 +2806,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "지원하는 형식의 데이터가 아닙니다."
@@ -2734,9 +2843,8 @@ msgid "View profile designs"
msgstr "프로필 디자인 보기"
#: actions/othersettings.php:123
-#, fuzzy
msgid "Show or hide profile designs."
-msgstr "프로필 디자인 보기"
+msgstr "프로필 디자인 보이거나 감춥니다."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2848,148 +2956,165 @@ msgstr "경로"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "인스턴트 메신저를 사용할 수 없습니다."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "아바타가 삭제되었습니다."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "사이트"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "SSL 서버"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "경로"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "사이트 테마"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "테마 디렉터리"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "테마"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "테마 서버"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "사이트에 대한 테마"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "테마 경로"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL 서버"
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "사이트 테마"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "테마 디렉터리"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "아바타"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "아바타가 삭제되었습니다."
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "아바타 경로"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "아바타가 삭제되었습니다."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "배경"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "항상"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "배경 경로"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "배경 디렉터리"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "첨부파일"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "SSL 서버"
-#: actions/pathsadminpanel.php:324
-#, fuzzy
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
-msgstr "통지"
+msgstr "가끔"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
-msgstr ""
+msgstr "언제나"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL 사용"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
-msgstr ""
+msgstr "언제 SSL 사용"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL 서버"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "사이트 테마"
@@ -3061,14 +3186,13 @@ msgid "URL of your homepage, blog, or profile on another site"
msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
#: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d chars"
-msgstr "140자 이내에서 자기 소개"
+msgstr "%d자 이내에서 자기 소개 및 자기 관심사"
#: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
msgid "Describe yourself and your interests"
-msgstr "당신에 대해 소개해주세요."
+msgstr "자기 소개 및 자기 관심사"
#: actions/profilesettings.php:127 actions/register.php:473
msgid "Bio"
@@ -3535,9 +3659,8 @@ msgid "Remote subscribe"
msgstr "리모트 구독 예약"
#: actions/remotesubscribe.php:124
-#, fuzzy
msgid "Subscribe to a remote user"
-msgstr "이 회원을 구독합니다."
+msgstr "원격 사용자에 구독"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3737,7 +3860,7 @@ msgstr "기관 이름이 필요합니다."
msgid "Description"
msgstr "설명"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "통계"
@@ -3872,45 +3995,45 @@ msgstr ""
msgid "Group actions"
msgstr "그룹 행동"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s 그룹을 위한 공지피드 (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "%s의 보낸쪽지함"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "회원"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "모든 회원"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "생성됨"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3920,7 +4043,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3931,7 +4054,7 @@ msgstr ""
"**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/"
"Micro-blogging)의 사용자 그룹입니다. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
#, fuzzy
msgid "Admins"
msgstr "관리자"
@@ -4147,9 +4270,8 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "사이트 공지"
+msgstr "사이트 공지 사항"
#: actions/sitenoticeadminpanel.php:67
#, fuzzy
@@ -4830,6 +4952,8 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"이 사이트는 %1$s %2$s 버전으로 운영됩니다. Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
#: actions/version.php:163
msgid "Contributors"
@@ -4842,6 +4966,9 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"이 프로그램은 자유 소프트웨어입니다. 소프트웨어의 피양도자는 자유 소프트웨어 "
+"재단이 공표한 GNU Affero 일반 공중 사용 허가서 3판 또는 그 이후 판을 임의로 "
+"선택해서, 그 규정에 따라 프로그램을 개작하거나 재배포할 수 있습니다."
#: actions/version.php:176
msgid ""
@@ -4850,6 +4977,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"이 프로그램은 유용하게 사용될 수 있으리라는 희망에서 배포되고 있지만, 특정한 "
+"목적에 맞는 적합성 여부나 판매용으로 사용할 수 있으리라는 묵시적인 보증을 포"
+"함한 어떠한 형태의 보증도 제공하지 않습니다. 보다 자세한 사항에 대해서는 GNU "
+"Affero 일반 공중 사용 허가서를 참고하시기 바랍니다."
#: actions/version.php:182
#, php-format
@@ -4857,18 +4988,19 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"GNU 일반 공중 사용 허가서는 이 프로그램과 함께 제공됩니다. 만약, 이 문서가 누"
+"락되어 있다면 %s 페이지를 보십시오."
#: actions/version.php:191
msgid "Plugins"
msgstr "플러그인"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "버전"
#: actions/version.php:199
-#, fuzzy
msgid "Author(s)"
msgstr "작성자"
@@ -4888,7 +5020,7 @@ msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일
#: classes/File.php:142
#, php-format
msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "'%s' URL을 처리할 수 없습니다"
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
#: classes/File.php:174
@@ -5094,9 +5226,8 @@ 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 "이용자가 프로필을 가지고 있지 않습니다."
+msgstr "프로파일이 없습니다."
#. TRANS: Exception thrown when a tag cannot be saved.
#: classes/Status_network.php:338
@@ -5104,7 +5235,7 @@ msgid "Unable to save tag."
msgstr "태그를 저장할 수 없습니다."
#. 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 "귀하는 구독이 금지되었습니다."
@@ -5227,187 +5358,186 @@ msgid "Untitled page"
msgstr "제목없는 페이지"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "주 사이트 네비게이션"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "개인"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "연결"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "관리"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "초대"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "이 사이트에서 로그아웃"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "로그아웃"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "새 계정 만들기"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "등록"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "이 사이트에 로그인"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "로그인"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "도움말"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "도움말"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
-#, fuzzy
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr "프로필이나 텍스트 검색"
+msgstr "사람이나 단어 검색"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "검색"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "사이트 공지"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "로컬 뷰"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "페이지 공지"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "도움말"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "정보"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "자주 묻는 질문"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "서비스 약관"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "개인정보 취급방침"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "소스 코드"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "연락하기"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "배지"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet 소프트웨어 라이선스"
@@ -5415,17 +5545,17 @@ msgstr "StatusNet 소프트웨어 라이선스"
#. 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:844
-#, fuzzy, php-format
+#: lib/action.php:872
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
-"마이크로블로깅서비스입니다."
+"**%%site.name%%** 사이트는 [%%site.broughtby%%](%%site.broughtbyurl%%)에서 제"
+"공하는 마이크로블로깅서비스입니다."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -5434,7 +5564,7 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5446,51 +5576,51 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
#. 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "페이지수"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "앞 페이지"
@@ -5593,9 +5723,8 @@ msgstr "메일 주소 확인"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:385
-#, fuzzy
msgid "Edit site notice"
-msgstr "사이트 공지"
+msgstr "사이트 공지 편집"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:393
@@ -5634,20 +5763,19 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
-#, fuzzy
msgid "Edit application"
-msgstr "응용 프로그램 수정"
+msgstr "응용 프로그램 편집"
#. TRANS: Form guide.
#: lib/applicationeditform.php:178
@@ -5725,11 +5853,6 @@ msgstr "읽기 쓰기"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "취소"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5756,11 +5879,6 @@ msgstr "제거"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "첨부파일"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6185,14 +6303,13 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "SMS에 의한 업데이트"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "연결"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -6315,7 +6432,7 @@ msgstr ""
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "구성원"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6888,24 +7005,24 @@ msgstr "찔러 보기"
msgid "Send a nudge to this user"
msgstr "이 사용자에게 찔러 보기 메시지 보내기"
-#: lib/oauthstore.php:283
+#: 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 "예약 구독을 추가 할 수 없습니다."
@@ -7265,60 +7382,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, 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:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, 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:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, 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:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index d3c2b0829..b98fe4f56 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:58+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:50+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +93,15 @@ msgstr "Зачувај"
msgid "No such page."
msgstr "Нема таква страница."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "Вие и пријателите"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Подновувања од %1$s и пријатели на %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "API методот не е пронајден."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,44 +311,62 @@ msgstr "Блокирањето на корисникот не успеа."
msgid "Unblock user failed."
msgstr "Не успеа одблокирањето на корисникот."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Директни пораки од %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Сите директни пораки испратени од %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Директни пораки до %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Сите директни пораки испратени до %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Нема текст за пораката!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Ова е предолго. Максималната должина изнесува %d знаци."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 знаци."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Примачот не е пронајден."
-#: 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 ""
"Неможете да испраќате директни пораки на корисници што не Ви се пријатели."
+#. 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 ""
+"Не испраќајте си порака самите на себе; подобро тивко кажете си го тоа на "
+"себеси."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -529,15 +549,21 @@ msgstr "групи на %s"
msgid "Upload failed."
msgstr "Подигањето не успеа."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Назначен е неважечки најавен жетон."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Нема наведено oauth_token параметар."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Погрешен жетон."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -555,36 +581,24 @@ msgstr "Погрешен жетон."
msgid "There was a problem with your session token. Try again, please."
msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Погрешен прекар / лозинка!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Грешка при бришењето на корисникот на OAuth-програмот."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Грешка во базата на податоци при вметнувањето на корисникот на OAuth-"
"програмот."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "Жетонот на барањето %s е одобрен. Заменете го со жетон за пристап."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Жетонот на барањето %s е одбиен и поништен."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -593,15 +607,15 @@ msgstr "Жетонот на барањето %s е одбиен и поништ
msgid "Unexpected form submission."
msgstr "Неочекувано поднесување на образец."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Има програм кој сака да се поврзе со Вашата сметка"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Дозволи или одбиј пристап"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -613,11 +627,11 @@ msgstr ""
"пристап до Вашата %4$s сметка само на трети страни на кои им верувате."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Сметка"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -626,23 +640,47 @@ msgid "Nickname"
msgstr "Прекар"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Лозинка"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Одбиј"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Откажи"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Дозволи"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Дозволете или одбијте пристап до податоците за Вашата сметка."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Потврдата на IM е откажана."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Жетонот на барањето %s е одбиен и поништен."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Не сте авторизирани."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Методот бара POST или DELETE."
@@ -807,7 +845,8 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Бриши"
@@ -864,12 +903,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Не"
@@ -882,12 +922,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -902,9 +943,12 @@ msgstr "Блокирај го корисников"
msgid "Failed to save block information."
msgstr "Не можев да ги снимам инофрмациите за блокот."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1030,7 +1074,7 @@ msgstr "Не сте сопственик на овој програм."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1058,6 +1102,67 @@ msgstr "Не го бриши овој програм"
msgid "Delete this application"
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 "Мора да сте најавени за да можете да ја напуштите групата."
+
+#. 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 "Нема прекар или 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 "Не членувате во оваа група."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s ја напушти групата %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Бриши корисник"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Не ја бриши оваа забелешка"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Избриши овој корисник"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1134,53 +1239,63 @@ msgstr "Изглед"
msgid "Design settings for this StatusNet site"
msgstr "Нагодувања на изгледот на ова StatusNet-мрежно место."
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Погрешен URL на лого."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Погрешен URL на лого."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Темата е недостапна: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Промени лого"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Лого на мрежното место"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Лого на мрежното место"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Промени изглед"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Изглед на мрежното место"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Изглед за мрежното место."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Прилагоден мотив"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Можете да подигнете свој изглед за StatusNet како .ZIP архив."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Промена на слика на позадина"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Позадина"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1190,66 +1305,66 @@ msgstr ""
"големина на податотеката е %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Искл."
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Вклучи или исклучи позадинска слика."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Позадината во квадрати"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Промена на бои"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Содржина"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Странична лента"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Врски"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Напредно"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Прилагодено CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Користи по основно"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Врати основно-зададени нагодувања"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Врати по основно"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1259,7 +1374,7 @@ msgstr "Врати по основно"
msgid "Save"
msgstr "Зачувај"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Зачувај изглед"
@@ -1735,7 +1850,7 @@ msgstr "Не можев да ги претворам жетоните за ба
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Далечинската служба користи непозната верзија на OMB протокол."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Грешка во подновувањето на далечинскиот профил."
@@ -2335,10 +2450,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Мора да сте најавени за да можете да се зачлените во група."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Нема прекар или ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2587,6 +2698,11 @@ msgstr "Не можете да испратите порака до овојо
msgid "No content!"
msgstr "Нема содржина!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Ова е предолго. Максималната должина изнесува %d знаци."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Нема назначено примач."
@@ -2750,7 +2866,7 @@ msgstr "Ве молиме користете само %s URL-адреси врз
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2900,147 +3016,166 @@ msgstr "Патеки"
msgid "Path and server settings for this StatusNet site"
msgstr "Нагодувања за патеки и опслужувачи за оваа StatusNet-мрежно место."
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Директориумот на темата е нечитлив: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Директориумот на аватарот е недостапен за запишување: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Директориумот на позадината е нечитлив: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Директориумот на локалите е нечитлив: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Неважечки SSL-опслужувач. Дозволени се најмногу до 255 знаци"
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Мреж. место"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Опслужувач"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Назив на домаќинот на опслужувачот на мрежното место"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Патека"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Патека на мрежното место"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Патека до локалите"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Директориум на темата"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Патека до директориумот на локалите"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Интересни URL-адреси"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Изглед"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Oпслужувач на темата"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Изглед за мрежното место."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Патека до темата"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-опслужувач"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Патека на мрежното место"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Директориум на темата"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Патека до директориумот на локалите"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Аватари"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Опслужувач на аватарот"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Патека на аватарот"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Директориум на аватарот"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Позадини"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Oпслужувач на позаднината"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Патека до позадината"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Директориум на позадината"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Прилози"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Никогаш"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Понекогаш"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Секогаш"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Користи SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Кога се користи SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-опслужувач"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Oпслужувач, кому ќе му се испраќаат SSL-барања"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Зачувај патеки"
@@ -3814,7 +3949,7 @@ msgstr "Организација"
msgid "Description"
msgstr "Опис"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистики"
@@ -3958,45 +4093,45 @@ msgstr "Алијаси"
msgid "Group actions"
msgstr "Групни дејства"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Канал со забелешки за групата %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Канал со забелешки за групата %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Канал со забелешки за групата%s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF за групата %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Членови"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Сите членови"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Создадено"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4012,7 +4147,7 @@ msgstr ""
"се](%%%%action.register%%%%) за да станете дел од оваа група и многу повеќе! "
"([Прочитајте повеќе](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4025,7 +4160,7 @@ msgstr ""
"слободната програмска алатка [StatusNet](http://status.net/). Нејзините "
"членови си разменуваат кратки пораки за нивниот живот и интереси. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Администратори"
@@ -4915,8 +5050,7 @@ msgstr "%s не членува во ниедна група."
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
-"Обидете се со [пребарување на групи](%%action.groupsearch%%) и придружете им "
-"се."
+"Обидете се да [најдете групи](%%action.groupsearch%%) и да се зачлените."
#. 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.
@@ -4985,7 +5119,7 @@ msgid "Plugins"
msgstr "Приклучоци"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Верзија"
@@ -5079,7 +5213,7 @@ msgstr "Грешка во зачувувањето на корисникот; н
#. TRANS: Activity title.
#: classes/Group_member.php:113 lib/joinform.php:114
msgid "Join"
-msgstr "Придружи се"
+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.
@@ -5224,7 +5358,7 @@ msgid "Unable to save tag."
msgstr "Не можам да ја зачувам ознаката."
#. 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 "Блокирани сте од претплаќање."
@@ -5345,185 +5479,185 @@ msgid "Untitled page"
msgstr "Страница без наслов"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Главна навигација"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Поврзи се"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Админ"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Покани"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Одјава"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Одјава"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создај сметка"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Регистрација"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Најава"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Најава"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Напомош!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Помош"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текст"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Барај"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Напомена за мрежното место"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Локални прегледи"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Напомена за страницата"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Споредна навигација"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Помош"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "За"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "ЧПП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Услови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Приватност"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Изворен код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Контакт"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Значка"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
@@ -5531,7 +5665,7 @@ msgstr "Лиценца на програмот StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5541,7 +5675,7 @@ msgstr ""
"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -5550,7 +5684,7 @@ msgstr "**%%site.name%%** е сервис за микроблогирање."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5562,20 +5696,20 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содржината и податоците на %1$s се лични и доверливи."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5583,7 +5717,7 @@ msgstr ""
"права задржани."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -5591,25 +5725,25 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Прелом на страници"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Претходно"
@@ -5751,12 +5885,12 @@ msgid "Could not authenticate you."
msgstr "Не можевме да Ве потврдиме."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Се обидовте да отповикате непознат жетон."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Не успеав да го избришам отповиканиот жетон."
@@ -5840,11 +5974,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Основно-зададен пристап за овој програм: само читање, или читање-пишување"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Откажи"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5871,11 +6000,6 @@ msgstr "Одземи"
msgid "author element must contain a name element."
msgstr "авторскиот елемент мора да содржи елемент на име."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Прилози"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6338,14 +6462,14 @@ msgstr "СМС"
msgid "Updates by SMS"
msgstr "Подновувања по СМС"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Сврзувања"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Овластени поврзани програми"
@@ -7149,24 +7273,24 @@ msgstr "Подбуцни"
msgid "Send a nudge to this user"
msgstr "Испрати подбуцнување на корисников"
-#: lib/oauthstore.php:283
+#: 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 "Не може да се внесе нова претплата."
@@ -7521,17 +7645,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "пред неколку секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7539,12 +7663,12 @@ msgstr[0] "пред околу една минута"
msgstr[1] "пред околу %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "пред еден час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7552,12 +7676,12 @@ msgstr[0] "пред околу еден час"
msgstr[1] "пред околу %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7565,12 +7689,12 @@ msgstr[0] "пред околу еден ден"
msgstr[1] "пред околу %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "пред еден месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7578,7 +7702,7 @@ msgstr[0] "пред околу еден месец"
msgstr[1] "пред околу %d месеци"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index a724b6fbb..168ceaa95 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:01+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:53+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -91,14 +91,15 @@ msgstr "Lagre"
msgid "No such page."
msgstr "Ingen slik side."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -114,7 +115,7 @@ msgstr "Ingen slik side."
#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "Ingen slik bruker"
+msgstr "Ingen slik bruker."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:90
@@ -198,12 +199,13 @@ msgstr "Du og venner"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringer fra %1$s og venner på %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -231,7 +233,7 @@ msgstr "API-metode ikke funnet!"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -308,43 +310,60 @@ msgstr "Blokkering av bruker mislyktes."
msgid "Unblock user failed."
msgstr "Oppheving av blokkering av bruker mislyktes."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direktemeldinger fra %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle direktemeldinger sendt fra %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direktemeldinger til %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle direktemeldinger sendt til %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Ingen meldingstekst!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Dette er for langt. Meldingen kan bare være %d tegn lang."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Dette er for langt. Meldingen kan bare være %d tegn lang."
+msgstr[1] "Dette er for langt. Meldingen kan bare være %d tegn lang."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Fant ikke mottakeren."
-#: 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 direktemeldinger til brukere du ikke er venn med."
+#. 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 ""
+"Ikke send en melding til degselv; bare hvisk det stille til degselv istedet."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -524,15 +543,21 @@ msgstr "grupper på %s"
msgid "Upload failed."
msgstr "Opplasting feilet."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ugyldig symbol."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Ingen verdi for oauth_token er oppgitt."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Ugyldig symbol."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -550,34 +575,22 @@ msgstr "Ugyldig symbol."
msgid "There was a problem with your session token. Try again, please."
msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Ugyldig kallenavn / passord!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Databasefeil ved sletting av bruker fra programmet OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -586,15 +599,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Uventet skjemainnsending."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Et program ønsker å koble til kontoen din"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Tillat eller nekt tilgang"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -606,11 +619,11 @@ msgstr ""
"$s-konto til tredjeparter du stoler på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -619,23 +632,47 @@ msgid "Nickname"
msgstr "Nick"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Nekt"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Avbryt"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Tillat"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Tillat eller nekt tilgang til din kontoinformasjon."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Direktemeldingsbekreftelse avbrutt."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Du er ikke autorisert."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Denne metoden krever en POST eller DELETE."
@@ -796,7 +833,8 @@ msgid "Preview"
msgstr "Forhåndsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Slett"
@@ -852,12 +890,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
@@ -870,12 +909,13 @@ msgstr "Ikke blokker denne brukeren"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -890,9 +930,12 @@ msgstr "Blokker denne brukeren"
msgid "Failed to save block information."
msgstr "Kunne ikke lagre blokkeringsinformasjon."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1018,7 +1061,7 @@ msgstr "Du er ikke eieren av dette programmet."
#. 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:1307
+#: lib/action.php:1353
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
@@ -1047,6 +1090,67 @@ msgstr "Ikke slett dette programmet"
msgid "Delete this application"
msgstr "Slett dette programmet"
+#. 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 "Du må være innlogget for å forlate en gruppe."
+
+#. 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 "ngen kallenavn eller 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 "Du er ikke et medlem av denne gruppen."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Kunne ikke oppdatere gruppe."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s forlot gruppe %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Slett bruker"
+
+#: 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 ""
+"Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
+"om brukeren fra databasen, uten sikkerhetskopi."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Ikke slett denne notisen"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Slett denne brukeren"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1123,53 +1227,63 @@ msgstr "Utseende"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Ugyldig logo-URL."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Ugyldig logo-URL."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema ikke tilgjengelig: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Endre logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Nettstedslogo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Nettstedslogo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Endre tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Nettstedstema"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema for nettstedet."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Egendefinert tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan laste opp et egendefinert StatusNet-tema som et .ZIP-arkiv."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Endre bakgrunnsbilde"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrunn"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1178,66 +1292,66 @@ msgstr ""
"Du kan laste opp et bakgrunnsbilde for nettstedet. Maks filstørrelse 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:550 lib/designsettings.php:139
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Slå på eller av bakgrunnsbilde."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Gjenta bakgrunnsbildet"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Endre farger"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Innhold"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidelinje"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Lenker"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avansert"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Egendefinert CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Bruk standard"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Gjenopprett standardutseende"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Tilbakestill til standardverdier"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1247,7 +1361,7 @@ msgstr "Tilbakestill til standardverdier"
msgid "Save"
msgstr "Lagre"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Lagre utseende"
@@ -1719,7 +1833,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Feil ved oppdatering av fjernprofil."
@@ -2305,10 +2419,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Du må være innlogget for å bli med i en gruppe."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "ngen kallenavn eller ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2551,6 +2661,11 @@ msgstr "Du kan ikke sende en melding til denne brukeren."
msgid "No content!"
msgstr "Inget innhold."
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dette er for langt. Meldingen kan bare være %d tegn lang."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Ingen mottaker oppgitt."
@@ -2712,7 +2827,7 @@ msgstr "Bare %s-nettadresser over vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Ikke et støttet dataformat."
@@ -2861,147 +2976,166 @@ msgstr "Stier"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Temamappe ikke lesbar: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Avatarmappe ikke skrivbar: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Bakgrunnsmappe ikke skrivbar: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Lokaliseringsmappe ikke lesbar: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ugyldig SSL-tjener. Maks lengde er 255 tegn."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Nettsted"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Tjener"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Vertsnavn for nettstedets tjener."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Sti"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Nettstedssti"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Lokaliseringssti"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Temamappe"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Lokaliseringsmappesti"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Pyntede nettadresser"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Tematjener"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema for nettstedet."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Temasti"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-tjener"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Nettstedssti"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Temamappe"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Lokaliseringsmappesti"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatarer"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatartjener"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avatarsti"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatarmappe"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Bakgrunner"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Bakgrunnstjener"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Bakgrunnssti"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Bakgrunnsmappe"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Vedlegg"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Aldri"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Noen ganger"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Alltid"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Bruk SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Når SSL skal brukes"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-tjener"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Tjener SSL-forespørsler skal vises til"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Lagre stier"
@@ -3762,7 +3896,7 @@ msgstr "Organisasjon"
msgid "Description"
msgstr "Beskrivelse"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistikk"
@@ -3906,45 +4040,45 @@ msgstr "Alias"
msgid "Group actions"
msgstr "Gruppehandlinger"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Notismating for %s gruppe (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Notismating for %s gruppe (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Notismating for %s gruppe (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF for gruppen %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Medlemmer"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ingen)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alle medlemmer"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Opprettet"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3960,7 +4094,7 @@ msgstr ""
"%%%) for å bli medlem av denne gruppen og mange fler. ([Les mer](%%%%doc.help"
"%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3973,7 +4107,7 @@ msgstr ""
"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler "
"korte meldinger om deres liv og interesser. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administratorer"
@@ -4909,7 +5043,7 @@ msgid "Plugins"
msgstr "Programtillegg"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versjon"
@@ -5141,7 +5275,7 @@ msgid "Unable to save tag."
msgstr "Kunne ikke lagre nettstedsnotis."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukeren har blokkert deg fra å abonnere."
@@ -5264,188 +5398,188 @@ msgid "Untitled page"
msgstr "Side uten tittel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
#, fuzzy
msgid "Primary site navigation"
msgstr "Endre nettstedskonfigurasjon"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personlig"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endre e-posten, avateren, passordet og profilen din"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Koble til tjenester"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Koble til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Endre nettstedskonfigurasjon"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter venner og kollegaer til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Inviter"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg ut fra nettstedet"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Logg ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett en konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrer"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Log inn på nettstedet"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp meg."
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter personer eller tekst"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Nettstedsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokale visninger"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "OSS/FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
#, fuzzy
msgid "Privacy"
msgstr "Privat"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Kilde"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "Knuff"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Programvarelisens for StatusNet"
@@ -5453,7 +5587,7 @@ msgstr "Programvarelisens for StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5463,7 +5597,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -5472,7 +5606,7 @@ msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5481,52 +5615,52 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "Programvarelisens for StatusNet"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
#, 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:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Etter"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Før"
@@ -5672,12 +5806,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5763,11 +5897,6 @@ msgstr ""
"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
"skrivetilgang"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Avbryt"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5794,11 +5923,6 @@ msgstr "Tilbakekall"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Vedlegg"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6227,14 +6351,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Oppdatert med SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Tilkoblinger"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
#, fuzzy
msgid "Authorized connected applications"
@@ -7033,24 +7157,24 @@ msgstr "Knuff"
msgid "Send a nudge to this user"
msgstr "Send et knuff til denne brukeren"
-#: lib/oauthstore.php:283
+#: 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
#, fuzzy
msgid "Couldn't insert new subscription."
msgstr "Kunne ikke sette inn bekreftelseskode."
@@ -7415,17 +7539,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7433,12 +7557,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7446,12 +7570,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7459,12 +7583,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7472,7 +7596,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 87ad36fd0..afc922a1b 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:06:59+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:51+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +93,15 @@ msgstr "Opslaan"
msgid "No such page."
msgstr "Deze pagina bestaat niet."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -203,12 +204,13 @@ msgstr "U en vrienden"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates van %1$s en vrienden op %2$s."
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -235,7 +237,7 @@ msgstr "De API-functie is niet aangetroffen."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -311,45 +313,60 @@ msgstr "Het blokkeren van de gebruiker is mislukt."
msgid "Unblock user failed."
msgstr "Het deblokkeren van de gebruiker is mislukt."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Privéberichten van %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle privéberichten van %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Privéberichten aan %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle privéberichten aan %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Het bericht is leeg!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127
#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
+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] "Dat is te lang. De maximale berichtlengte is %d teken."
+msgstr[1] "Dat is te lang. De maximale berichtlengte is %d tekens."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "De ontvanger is niet aangetroffen."
-#: 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 ""
"U kunt geen privéberichten sturen aan gebruikers die niet op uw "
"vriendenlijst staan."
+#. 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 "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -536,15 +553,19 @@ msgstr "groepen op %s"
msgid "Upload failed."
msgstr "Uploaden is mislukt."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+msgid "Invalid request token or verifier."
+msgstr "Het opgegeven token of controlegetal is ongeldig."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Er is geen oauth_token parameter opgegeven."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
-msgstr "Ongeldig token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+msgid "Invalid request token."
+msgstr "Ongeldig verzoektoken."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -564,40 +585,26 @@ msgstr ""
"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
"alstublieft."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Ongeldige gebruikersnaam of wachtwoord."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Er is een databasefout opgetreden tijdens het verwijderen van de OAuth "
"applicatiegebruiker."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
"applicatiegebruiker."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Het verzoektoken %s is geautoriseerd. Wissel het alstublieft uit voor een "
-"toegangstoken."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -606,15 +613,15 @@ msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
msgid "Unexpected form submission."
msgstr "Het formulier is onverwacht ingezonden."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Toegang toestaan of ontzeggen"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -626,11 +633,11 @@ msgstr ""
"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Gebruiker"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -639,22 +646,46 @@ msgid "Nickname"
msgstr "Gebruikersnaam"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Wachtwoord"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Ontzeggen"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Annuleren"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Toestaan"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
-msgstr "Toegang tot uw gebruikersgegevens toestaan of ontzeggen."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr "Toegang tot uw gebruikersgegevens geven."
+
+#: actions/apioauthauthorize.php:433
+msgid "Authorization canceled."
+msgstr "Autorisatie geannuleerd."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr "Het verzoektoken %s is ingetrokken."
+
+#: actions/apioauthauthorize.php:453
+#, php-format
+msgid "You have successfully authorized %s."
+msgstr "U hebt %s geautoriseerd."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+"Ga terug naar %s en voer daar de volgende beveiligingscode in om het proces "
+"af te ronden."
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
@@ -819,7 +850,8 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Verwijderen"
@@ -876,12 +908,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nee"
@@ -894,12 +927,13 @@ msgstr "Gebruiker niet blokkeren"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -914,9 +948,12 @@ msgstr "Deze gebruiker blokkeren"
msgid "Failed to save block information."
msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1042,7 +1079,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1070,6 +1107,66 @@ msgstr "Deze applicatie niet verwijderen"
msgid "Delete this application"
msgstr "Deze applicatie verwijderen"
+#. 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 "U moet aangemeld zijn om een groep te kunnen verwijderen."
+
+#. 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 "Geen gebruikersnaam of 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 "U mag deze groep niet verwijderen."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Het was niet mogelijk de groep bij te werken."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s heeft de groep %2$s verlaten"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Gebruiker verwijderen"
+
+#: 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 ""
+"Weet u zeker dat u deze gebruiker wilt verwijderen? Door deze handeling "
+"worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
+"niet mogelijk ze terug te zetten."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Deze mededeling niet verwijderen"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Gebruiker verwijderen"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1147,53 +1244,63 @@ msgstr "Uiterlijk"
msgid "Design settings for this StatusNet site"
msgstr "Instellingen voor de vormgeving van deze StatusNet-website"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "De logo-URL is ongeldig."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "De logo-URL is ongeldig."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "De vormgeving is niet beschikbaar: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Logo wijzigen"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Websitelogo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Websitelogo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Vormgeving wijzigen"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Vormgeving website"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Mogelijke vormgevingen voor deze website."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Aangepaste vormgeving"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "U kunt een vormgeving voor StatusNet uploaden als ZIP-archief."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1203,66 +1310,66 @@ msgstr ""
"bestandsgrootte is %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Uit"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kleuren wijzigen"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Menubalk"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Uitgebreid"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Aangepaste CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1272,7 +1379,7 @@ msgstr "Standaardinstellingen toepassen"
msgid "Save"
msgstr "Opslaan"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -1751,7 +1858,7 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr ""
"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
@@ -2355,10 +2462,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "U moet aangemeld zijn om lid te worden van een groep."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Geen gebruikersnaam of ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2605,6 +2708,11 @@ msgstr "U kunt geen bericht naar deze gebruiker zenden."
msgid "No content!"
msgstr "Geen inhoud!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Er is geen ontvanger aangegeven."
@@ -2771,7 +2879,7 @@ msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2919,147 +3027,166 @@ msgstr "Paden"
msgid "Path and server settings for this StatusNet site"
msgstr "Pad- en serverinstellingen voor de StatusNet-website"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Er kan niet in de avatarmap geschreven worden: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Er kan niet in de achtergrondmap geschreven worden: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Er kan niet uit de talenmap gelezen worden: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Website"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Hostnaam van de website server."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Pad"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Websitepad"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Talenpad"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Vormgevingsmap"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Talenmap"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Nette URL's"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Vormgeving"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Vormgevingsserver"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Mogelijke vormgevingen voor deze website."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Vormgevingspad"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-server"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Websitepad"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Vormgevingsmap"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Talenmap"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatars"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatarserver"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Avatarpad"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Avatarmap"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Achtergronden"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Achtergrondenserver"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Achtergrondpad"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Achtergrondenmap"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Bijlagen"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nooit"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Soms"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Altijd"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSL gebruiken"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Wanneer SSL gebruikt moet worden"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Opslagpaden"
@@ -3835,7 +3962,7 @@ msgstr "Organisatie"
msgid "Description"
msgstr "Beschrijving"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistieken"
@@ -3980,45 +4107,45 @@ msgstr "Aliassen"
msgid "Group actions"
msgstr "Groepshandelingen"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Mededelingenfeed voor groep %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Mededelingenfeed voor groep %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Mededelingenfeed voor groep %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Vriend van een vriend voor de groep %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Leden"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(geen)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alle leden"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Aangemaakt"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4034,7 +4161,7 @@ msgstr ""
"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%"
"%%)"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4047,7 +4174,7 @@ msgstr ""
"[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit "
"over hun ervaringen en interesses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Beheerders"
@@ -5015,7 +5142,7 @@ msgid "Plugins"
msgstr "Plug-ins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versie"
@@ -5262,7 +5389,7 @@ msgid "Unable to save tag."
msgstr "Het was niet mogelijk om het label op te slaan."
#. 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 "U mag zich niet abonneren."
@@ -5383,185 +5510,185 @@ msgid "Untitled page"
msgstr "Naamloze pagina"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Persoonlijk"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Met andere diensten koppelen"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Koppelen"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Beheer"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Uitnodigingen"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Gebruiker afmelden"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Afmelden"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Gebruiker aanmaken"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registreren"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Gebruiker aanmelden"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Aanmelden"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Zoeken"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Mededeling van de website"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokale weergaven"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Mededeling van de pagina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Help"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Over"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Veel gestelde vragen"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacy"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Broncode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contact"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Widget"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
@@ -5569,7 +5696,7 @@ msgstr "Licentie van de StatusNet-software"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5579,7 +5706,7 @@ msgstr ""
"broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** is een microblogdienst."
@@ -5588,7 +5715,7 @@ msgstr "**%%site.name%%** is een microblogdienst."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5600,20 +5727,20 @@ msgstr ""
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5621,7 +5748,7 @@ msgstr ""
"voorbehouden."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -5629,26 +5756,26 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
"Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginering"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Later"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Eerder"
@@ -5790,12 +5917,12 @@ msgid "Could not authenticate you."
msgstr "U kon niet geauthenticeerd worden."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Er is geprobeerd een onbekend token in te trekken."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
@@ -5879,11 +6006,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Annuleren"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5910,11 +6032,6 @@ msgstr "Intrekken"
msgid "author element must contain a name element."
msgstr "Het element author moet een element name bevatten."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Bijlagen"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6380,13 +6497,13 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Updates via SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
msgctxt "MENU"
msgid "Connections"
msgstr "Koppelingen"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Geautoriseerde verbonden applicaties"
@@ -7190,24 +7307,24 @@ msgstr "Porren"
msgid "Send a nudge to this user"
msgstr "Deze gebruiker porren"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Fout tijdens het invoegen van een nieuw profiel."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Fout bij het invoegen van de avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Fout bij het invoegen van het profiel van een andere server."
#. 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 "Dubbele mededeling."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Kon nieuw abonnement niet toevoegen."
@@ -7568,17 +7685,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7586,12 +7703,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7599,12 +7716,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7612,12 +7729,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7625,7 +7742,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:1184
+#: lib/util.php:1194
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 aaf116c8d..1fa18bac8 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:00+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:52+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -100,14 +100,15 @@ msgstr "Lagra"
msgid "No such page."
msgstr "Dette emneord finst ikkje."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -202,12 +203,13 @@ msgstr "%s med vener"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringar frå %1$s og vener på %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -235,7 +237,7 @@ msgstr "Fann ikkje API-metode."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -312,43 +314,61 @@ msgstr "Blokkering av brukar feila."
msgid "Unblock user failed."
msgstr "De-blokkering av brukar feila."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, fuzzy, php-format
msgid "Direct messages from %s"
msgstr "Direkte meldingar til %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alle direkte meldingar sendt fra %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direkte meldingar til %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alle direkte meldingar sendt til %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Inga meldingstekst!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127
#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Du kan lasta opp ein logo for gruppa."
+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] "Du kan lasta opp ein logo for gruppa."
+msgstr[1] "Du kan lasta opp ein logo for gruppa."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Kunne ikkje finne mottakar."
-#: 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 ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
+#. 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 ""
+"Ikkje send ei melding til deg sjølv; berre sei det til deg sjølv stille og "
+"fredleg."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -535,16 +555,21 @@ msgstr "Gruppe handlingar"
msgid "Upload failed."
msgstr "Last opp fil"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ugyldig notisinnhald"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
+msgid "Invalid request token."
msgstr "Ugyldig storleik."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -562,37 +587,25 @@ msgstr "Ugyldig storleik."
msgid "There was a problem with your session token. Try again, please."
msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "Ugyldig brukarnamn eller passord."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "Feil ved å setja brukar."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -601,15 +614,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Uventa skjemasending."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -618,11 +631,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -631,22 +644,45 @@ msgid "Nickname"
msgstr "Kallenamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Passord"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr ""
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Avbryt"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
#, fuzzy
msgid "Allow"
msgstr "Alle"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Ingen stadfestingskode."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -812,7 +848,8 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Slett"
@@ -867,12 +904,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Merknad"
@@ -886,12 +924,13 @@ msgstr "Lås opp brukaren"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
@@ -907,9 +946,12 @@ msgstr "Blokkér denne brukaren"
msgid "Failed to save block information."
msgstr "Lagring av informasjon feila."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1039,7 +1081,7 @@ msgstr "Du er ikkje medlem av den gruppa."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -1067,6 +1109,65 @@ msgstr "Kan ikkje sletta notisen."
msgid "Delete this application"
msgstr "Slett denne notisen"
+#. 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 "Du må være innlogga for å melde deg ut av ei gruppe."
+
+#. 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 "Ingen kallenamn."
+
+#. 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 "Du er ikkje medlem av den gruppa."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Kann ikkje oppdatera gruppa."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s sin status på %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Slett"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Kan ikkje sletta notisen."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Slett denne notisen"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1147,58 +1248,68 @@ msgstr ""
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
#, fuzzy
msgid "Invalid logo URL."
msgstr "Ugyldig storleik."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Ugyldig storleik."
+
+#: actions/designadminpanel.php:341
#, fuzzy, php-format
msgid "Theme not available: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Endra"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Statusmelding"
+
+#: actions/designadminpanel.php:466
#, fuzzy
msgid "Change theme"
msgstr "Endra"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
#, fuzzy
msgid "Site theme"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
#, fuzzy
msgid "Theme for the site."
msgstr "Logg ut or sida"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1206,69 +1317,69 @@ msgid ""
msgstr "Du kan lasta opp ein logo for gruppa."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "Endra passordet ditt"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Innhald"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "Søk"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "Logg inn"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1278,7 +1389,7 @@ msgstr ""
msgid "Save"
msgstr "Lagra"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1768,7 +1879,7 @@ msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Ukjend versjon av OMB-protokollen."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Feil ved oppdatering av ekstern profil"
@@ -2358,11 +2469,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Du må være logga inn for å bli med i ei gruppe."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Ingen kallenamn."
-
#: actions/joingroup.php:141
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
@@ -2614,6 +2720,11 @@ msgstr "Du kan ikkje sende melding til denne brukaren."
msgid "No content!"
msgstr "Ingen innhald."
+#: actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Du kan lasta opp ein logo for gruppa."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Ingen mottakar spesifisert."
@@ -2775,7 +2886,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2928,155 +3039,173 @@ msgstr ""
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, fuzzy, php-format
msgid "Avatar directory not writable: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Denne sida er ikkje tilgjengleg i eit"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
#, fuzzy
msgid "Site"
msgstr "Invitér"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Tenar"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
#, fuzzy
msgid "Site path"
msgstr "Statusmelding"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Lasta opp brukarbilete."
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Logg ut or sida"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Tenar"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Statusmelding"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Lasta opp brukarbilete."
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatars"
msgstr "Brukarbilete"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
#, fuzzy
msgid "Avatar server"
msgstr "Avatar-innstillingar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "Lasta opp brukarbilete."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
#, fuzzy
msgid "Avatar directory"
msgstr "Lasta opp brukarbilete."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
msgstr ""
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
#, fuzzy
msgid "SSL"
msgstr "SMS"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Tenar"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
#, fuzzy
msgid "Sometimes"
msgstr "Notisar"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Tenar"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Statusmelding"
@@ -3847,7 +3976,7 @@ msgstr "Paginering"
msgid "Description"
msgstr "Beskriving"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistikk"
@@ -3981,45 +4110,45 @@ msgstr ""
msgid "Group actions"
msgstr "Gruppe handlingar"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Straum for vener av %s"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Straum for vener av %s"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Notisstraum for %s"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "Utboks for %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Medlemmar"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ingen)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alle medlemmar"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Framheva"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4029,7 +4158,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4040,7 +4169,7 @@ msgstr ""
"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
"wikipedia.org/wiki/Micro-blogging)-teneste"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
#, fuzzy
msgid "Admins"
msgstr "Administrator"
@@ -4988,7 +5117,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
#, fuzzy
msgid "Version"
msgstr "Personleg"
@@ -5229,7 +5358,7 @@ msgid "Unable to save tag."
msgstr "Kunne ikkje lagra emneord."
#. 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
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
@@ -5354,44 +5483,44 @@ msgid "Untitled page"
msgstr "Ingen tittel"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personleg"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Endra passordet ditt"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Kopla til"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
@@ -5399,83 +5528,82 @@ msgstr "Navigasjon for hovudsida"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invitér"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logg inn "
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Logo"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Opprett ei ny gruppe"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registrér"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logg inn "
-#: lib/action.php:503
+#: lib/action.php:531
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Logg inn"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:509
-#, fuzzy
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Hjelp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:515
+#: lib/action.php:543
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -5483,68 +5611,68 @@ msgstr "Søk"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Statusmelding"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokale syningar"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Hjelp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "OSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Personvern"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Kjeldekode"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
#, fuzzy
msgid "Badge"
msgstr "Dult"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
@@ -5552,7 +5680,7 @@ msgstr "StatusNets programvarelisens"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5562,7 +5690,7 @@ msgstr ""
"broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -5571,7 +5699,7 @@ msgstr "**%%site.name%%** er ei mikrobloggingteneste."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5583,51 +5711,51 @@ msgstr ""
"org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginering"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "« Etter"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Før »"
@@ -5782,12 +5910,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5873,11 +6001,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Avbryt"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5904,11 +6027,6 @@ msgstr "Gjenopprett"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr ""
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6337,14 +6455,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Oppdateringar over SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Kopla til"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -7053,24 +7171,24 @@ msgstr "Dult"
msgid "Send a nudge to this user"
msgstr "Send eit dult til denne brukaren"
-#: lib/oauthstore.php:283
+#: 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 "Kan ikkje leggja til ny tinging."
@@ -7439,17 +7557,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7457,12 +7575,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7470,12 +7588,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7483,12 +7601,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7496,7 +7614,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 e4fe1d7f0..2ac66f645 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:02+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:54+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -95,14 +95,15 @@ msgstr "Zapisz"
msgid "No such page."
msgstr "Nie ma takiej strony."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -204,12 +205,13 @@ msgstr "Ty i przyjaciele"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -236,7 +238,7 @@ msgstr "Nie odnaleziono metody API."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -311,45 +313,62 @@ msgstr "Zablokowanie użytkownika nie powiodło się."
msgid "Unblock user failed."
msgstr "Odblokowanie użytkownika nie powiodło się."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Bezpośrednie wiadomości do użytkownika %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Bezpośrednia wiadomość do użytkownika %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Brak tekstu wiadomości."
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+msgstr[1] "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+msgstr[2] "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Nie odnaleziono odbiorcy."
-#: 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 ""
"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
"twoimi przyjaciółmi."
+#. 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 "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -531,15 +550,21 @@ msgstr "grupy na %s"
msgid "Upload failed."
msgstr "Wysłanie nie powiodło się."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Podano nieprawidłowy token logowania."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Nie podano parametru oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Nieprawidłowy token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -557,35 +582,22 @@ msgstr "Nieprawidłowy token."
msgid "There was a problem with your session token. Try again, please."
msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nieprawidłowy pseudonim/hasło."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Błąd bazy danych podczas usuwania użytkownika aplikacji OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Token żądania %s został upoważniony. Proszę wymienić go na token dostępu."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Token żądania %s został odrzucony lub unieważniony."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -594,15 +606,15 @@ msgstr "Token żądania %s został odrzucony lub unieważniony."
msgid "Unexpected form submission."
msgstr "Nieoczekiwane wysłanie formularza."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Aplikacja chce połączyć się z kontem użytkownika"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Zezwolić czy odmówić dostęp"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -614,11 +626,11 @@ msgstr ""
"$s powinien być udostępniany tylko zaufanym osobom trzecim."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -627,23 +639,47 @@ msgid "Nickname"
msgstr "Pseudonim"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Hasło"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Odrzuć"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Anuluj"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Zezwól"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Zezwól lub odmów dostęp do informacji konta."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Anulowano potwierdzenie komunikatora."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Token żądania %s został odrzucony lub unieważniony."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Brak upoważnienia."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Ta metoda wymaga POST lub DELETE."
@@ -804,7 +840,8 @@ msgid "Preview"
msgstr "Podgląd"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Usuń"
@@ -860,12 +897,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nie"
@@ -878,12 +916,13 @@ msgstr "Nie blokuj tego użytkownika"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Tak"
@@ -898,9 +937,12 @@ msgstr "Zablokuj tego użytkownika"
msgid "Failed to save block information."
msgstr "Zapisanie informacji o blokadzie nie powiodło się."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1026,7 +1068,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -1053,6 +1095,67 @@ msgstr "Nie usuwaj tej aplikacji"
msgid "Delete this application"
msgstr "Usuń tę aplikację"
+#. 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 "Musisz być zalogowany, aby opuścić grupę."
+
+#. 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 "Brak pseudonimu lub identyfikatora."
+
+#. 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 "Nie jesteś członkiem tej grupy."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Nie można zaktualizować grupy."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "Użytkownik %1$s opuścił grupę %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Usuń użytkownika"
+
+#: 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 ""
+"Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z "
+"bazy danych, bez utworzenia kopii zapasowej."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Nie usuwaj tego wpisu"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Usuń tego użytkownika"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1129,53 +1232,63 @@ msgstr "Wygląd"
msgid "Design settings for this StatusNet site"
msgstr "Ustawienia wyglądu tej witryny StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Nieprawidłowy adres URL logo."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Nieprawidłowy adres URL logo."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Motyw nie jest dostępny: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Zmień logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo witryny"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo witryny"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Zmień motyw"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Motyw witryny"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Motyw witryny."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Własny motyw"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Można wysłać własny motyw witryny StatusNet jako archiwum zip."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Zmień obraz tła"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tło"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1183,66 +1296,66 @@ msgid ""
msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Włączone"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Wyłączone"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Zmień kolory"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Treść"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Panel boczny"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Zaawansowane"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Własny plik CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Użycie domyślnych"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1252,7 +1365,7 @@ msgstr "Przywróć domyślne ustawienia"
msgid "Save"
msgstr "Zapisz"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wygląd"
@@ -1726,7 +1839,7 @@ msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Błąd podczas aktualizowania zdalnego profilu."
@@ -2318,10 +2431,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Musisz być zalogowany, aby dołączyć do grupy."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Brak pseudonimu lub identyfikatora."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2568,6 +2677,11 @@ msgstr "Nie można wysłać wiadomości do tego użytkownika."
msgid "No content!"
msgstr "Brak treści."
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Nie podano odbiorcy."
@@ -2728,7 +2842,7 @@ msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2876,149 +2990,168 @@ msgstr "Ścieżki"
msgid "Path and server settings for this StatusNet site"
msgstr "Ustawienia ścieżki i serwera dla tej witryny StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Nie można odczytać katalogu motywu: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Nie można zapisywać w katalogu awatarów: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Nie można zapisywać w katalogu teł: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Nie można odczytać katalogu lokalizacji: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Nieprawidłowy serwer SSL. Maksymalna długość to 255 znaków."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Witryny"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Serwer"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nazwa komputera serwera strony."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Ścieżka"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Ścieżka do witryny"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Ścieżka do lokalizacji"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Katalog motywu"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Ścieżka do katalogu lokalizacji"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Eleganckie adresu URL"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
"Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
"adresów URL?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Motyw"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Serwer motywu"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Motyw witryny."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Serwer SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Ścieżka do witryny"
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Ścieżka do motywu"
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Katalog motywu"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Ścieżka do katalogu lokalizacji"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Awatary"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Serwer awatara"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Ścieżka do awatara"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Katalog awatara"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Tła"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Serwer tła"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Ścieżka do tła"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Katalog tła"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Załączniki"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nigdy"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Czasem"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Zawsze"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Użycie SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Kiedy używać SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Serwer SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Serwer do przekierowywania żądań SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Ścieżki zapisu"
@@ -3783,7 +3916,7 @@ msgstr "Organizacja"
msgid "Description"
msgstr "Opis"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statystyki"
@@ -3926,45 +4059,45 @@ msgstr "Aliasy"
msgid "Group actions"
msgstr "Działania grupy"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Kanał wpisów dla grupy %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Kanał wpisów dla grupy %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Kanał wpisów dla grupy %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF dla grupy %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Członkowie"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Brak)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Wszyscy członkowie"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Utworzono"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3980,7 +4113,7 @@ msgstr ""
"action.register%%%%), aby stać się częścią tej grupy i wiele więcej. "
"([Przeczytaj więcej](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3993,7 +4126,7 @@ msgstr ""
"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administratorzy"
@@ -4950,7 +5083,7 @@ msgid "Plugins"
msgstr "Wtyczki"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Wersja"
@@ -4966,9 +5099,9 @@ msgstr "Dodaj do ulubionych"
#. 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 "Użytkownik %s (@%s) dodał twój wpis jako ulubiony"
+msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:142
@@ -5151,9 +5284,9 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
#. 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:1120
-#, fuzzy, php-format
+#, php-format
msgid "Could not save reply for %1$d, %2$d."
-msgstr "Nie można zapisać informacji o lokalnej grupie."
+msgstr "Nie można zapisać odpowiedzi na %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.
@@ -5188,7 +5321,7 @@ msgid "Unable to save tag."
msgstr "Nie można zapisać etykiety."
#. 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 "Zablokowano subskrybowanie."
@@ -5230,9 +5363,9 @@ msgstr "Obserwuj"
#. 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 "Użytkownik %1$s dołączył do grupy %2$s."
+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.
@@ -5308,185 +5441,185 @@ msgid "Untitled page"
msgstr "Strona bez nazwy"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Główna nawigacja witryny"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Osobiste"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Połącz z serwisami"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Połącz"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Zmień konfigurację witryny"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrator"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Zaproś"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Wyloguj się z witryny"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Wyloguj się"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Utwórz konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Zarejestruj się"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Zaloguj się na witrynie"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Zaloguj się"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Pomoc"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Wyszukaj"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Wpis witryny"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokalne widoki"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Wpis strony"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Druga nawigacja witryny"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Pomoc"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "O usłudze"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Prywatność"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Kod źródłowy"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Odznaka"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
@@ -5494,7 +5627,7 @@ msgstr "Licencja oprogramowania StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5504,7 +5637,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -5513,7 +5646,7 @@ msgstr "**%%site.name%%** jest usługą mikroblogowania."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5525,20 +5658,20 @@ msgstr ""
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licencja zawartości witryny"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Treść i dane %1$s są prywatne i poufne."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5546,7 +5679,7 @@ msgstr ""
"zastrzeżone."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
@@ -5554,7 +5687,7 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5562,19 +5695,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginacja"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Później"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Wcześniej"
@@ -5716,12 +5849,12 @@ msgid "Could not authenticate you."
msgstr "Nie można uwierzytelnić."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Spróbowano unieważnić nieznany token."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
@@ -5806,11 +5939,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Anuluj"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5837,11 +5965,6 @@ msgstr "Unieważnij"
msgid "author element must contain a name element."
msgstr "element autora musi zawierać element nazwy."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Załączniki"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6308,14 +6431,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Aktualizacje przez wiadomości SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Połączenia"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Upoważnione połączone aplikacje"
@@ -7114,24 +7237,24 @@ msgstr "Szturchnij"
msgid "Send a nudge to this user"
msgstr "Wyślij szturchnięcie do tego użytkownika"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Błąd podczas wprowadzania nowego profilu."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Błąd podczas wprowadzania awatara."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Błąd podczas wprowadzania zdalnego profilu."
#. 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 "Podwójny wpis."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -7439,9 +7562,9 @@ msgstr "Zrezygnuj z subskrypcji"
#. 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
-#, fuzzy, php-format
+#, php-format
msgid "User %1$s (%2$d) has no profile record."
-msgstr "Użytkownik nie posiada profilu."
+msgstr "Użytkownik%1$s (%2$d) nie posiada wpisu profilu."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -7490,17 +7613,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7509,12 +7632,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7523,12 +7646,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7537,12 +7660,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7551,7 +7674,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:1184
+#: lib/util.php:1194
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 ed66ddfdf..35084b26c 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:03+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:55+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -94,14 +94,15 @@ msgstr "Gravar"
msgid "No such page."
msgstr "Página não foi encontrada."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -202,12 +203,13 @@ msgstr "Você e seus amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizações de %1$s e amigos no %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -234,7 +236,7 @@ msgstr "Método da API não encontrado."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -309,44 +311,60 @@ msgstr "Bloqueio do utilizador falhou."
msgid "Unblock user failed."
msgstr "Desbloqueio do utilizador falhou."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Mensagens directas de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Todas as mensagens directas enviadas por %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Mensagens directas para %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Todas as mensagens directas enviadas para %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Mensagem não tem texto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
+msgstr[1] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Destinatário não encontrado."
-#: 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 ""
"Não pode enviar mensagens directas a utilizadores que não sejam amigos."
+#. 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 "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -527,15 +545,21 @@ msgstr "Grupos em %s"
msgid "Upload failed."
msgstr "O upload falhou."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Chave de entrada especificada é inválida."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Não foi fornecido o parâmetro oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Chave inválida."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -553,34 +577,22 @@ msgstr "Chave inválida."
msgid "There was a problem with your session token. Try again, please."
msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Utilizador ou senha inválidos!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Erro na base de dados ao apagar o utilizador da aplicação OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "A chave de pedido %s foi autorizada. Troque-a por uma chave de acesso."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "A chave de pedido %s foi negada e retirada."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -589,15 +601,15 @@ msgstr "A chave de pedido %s foi negada e retirada."
msgid "Unexpected form submission."
msgstr "Envio inesperado de formulário."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Uma aplicação pretende ligar-se à sua conta"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permitir ou negar acesso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -609,11 +621,11 @@ msgstr ""
"permitir acesso à sua conta %4$s a terceiros da sua confiança."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -622,23 +634,47 @@ msgid "Nickname"
msgstr "Utilizador"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Negar"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancelar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permitir"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permitir ou negar acesso à informação da sua conta."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Confirmação do mensageiro instantâneo cancelada."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "A chave de pedido %s foi negada e retirada."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Não tem autorização."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Este método requer um POST ou DELETE."
@@ -687,7 +723,7 @@ msgstr "Não encontrado."
#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
+msgstr "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
@@ -799,7 +835,8 @@ msgid "Preview"
msgstr "Antevisão"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Apagar"
@@ -855,12 +892,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
@@ -873,12 +911,13 @@ msgstr "Não bloquear este utilizador"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -893,9 +932,12 @@ msgstr "Bloquear este utilizador"
msgid "Failed to save block information."
msgstr "Não foi possível gravar informação do bloqueio."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1021,7 +1063,7 @@ msgstr "Não é o proprietário desta aplicação."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -1049,6 +1091,67 @@ msgstr "Não apagar esta aplicação"
msgid "Delete this application"
msgstr "Apagar esta aplicação"
+#. 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 "Tem de iniciar uma sessão para deixar um grupo."
+
+#. 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 "Nenhum utilizador ou 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 "Não é membro deste grupo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Não foi possível actualizar o grupo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s deixou o grupo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Apagar utilizador"
+
+#: 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 ""
+"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
+"utilizador serão eliminados da base de dados, sem haver cópias."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Não apagar esta nota"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Apagar este utilizador"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1125,55 +1228,65 @@ msgstr "Estilo"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "URL do logotipo inválida."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL do logotipo inválida."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não está disponível: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Alterar logotipo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logotipo do site"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logotipo do site"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Alterar tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "O tema para o site."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Pode fazer o upload de um tema personalizado para o StatusNet, na forma de "
"um arquivo .ZIP."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Alterar imagem de fundo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1183,66 +1296,66 @@ msgstr ""
"é %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Ligar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Desligar"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ligar ou desligar a imagem de fundo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Repetir imagem de fundo em mosaico"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar cores"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinições"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Repor estilos predefinidos"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Repor predefinição"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1252,7 +1365,7 @@ msgstr "Repor predefinição"
msgid "Save"
msgstr "Gravar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Gravar o estilo"
@@ -1729,7 +1842,7 @@ msgstr "Não foi possível converter a chave de pedido numa chave de acesso."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Erro ao actualizar o perfil remoto."
@@ -2325,10 +2438,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nenhum utilizador ou ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2571,6 +2680,11 @@ msgstr "Não pode enviar uma mensagem a este utilizador."
msgid "No content!"
msgstr "Sem conteúdo!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Não especificou um destinatário."
@@ -2731,7 +2845,7 @@ msgstr "Só URLs %s sobre HTTP simples, por favor."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2880,147 +2994,166 @@ msgstr "Localizações"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Sem acesso de leitura do directório do tema: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Sem acesso de escrita no directório do avatar: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Sem acesso de escrita no directório do fundo: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Sem acesso de leitura ao directório das línguas: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servidor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nome do servidor do site."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Localização"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Localização do site"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Localização das línguas"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Directório do tema"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Localização do directório das línguas"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URLs bonitas"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Usar URLs bonitas (mais legíveis e memoráveis)"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servidor do tema"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "O tema para o site."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Localização do tema"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servidor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Localização do site"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Directório do tema"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Localização do directório das línguas"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servidor do avatar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Localização do avatar"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Directório do avatar"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Fundos"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servidor de fundos"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Localização dos fundos"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Directório dos fundos"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Anexos"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Às vezes"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servidor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servidor para onde encaminhar pedidos SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Gravar localizações"
@@ -3792,7 +3925,7 @@ msgstr "Organização"
msgid "Description"
msgstr "Descrição"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estatísticas"
@@ -3936,45 +4069,45 @@ msgstr "Nomes alternativos"
msgid "Group actions"
msgstr "Acções do grupo"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de notas do grupo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de notas do grupo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de notas do grupo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF do grupo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Nenhum)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Criado"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3990,7 +4123,7 @@ msgstr ""
"[Registe-se agora](%%action.register%%) para se juntar a este grupo e a "
"muitos mais! ([Saber mais](%%doc.help%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4003,7 +4136,7 @@ msgstr ""
"programa de Software Livre [StatusNet](http://status.net/). Os membros deste "
"grupo partilham mensagens curtas acerca das suas vidas e interesses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Gestores"
@@ -4956,7 +5089,7 @@ msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versão"
@@ -5194,7 +5327,7 @@ msgid "Unable to save tag."
msgstr "Não foi possível gravar a categoria."
#. 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 "Foi bloqueado de fazer subscrições"
@@ -5314,185 +5447,185 @@ msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ligar aos serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Ligar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Gestor"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar esta sessão"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registar"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisa"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Aviso do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Aviso da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Termos"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contacto"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Emblema"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
@@ -5500,7 +5633,7 @@ msgstr "Licença de software do StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5510,7 +5643,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -5519,7 +5652,7 @@ msgstr "**%%site.name%%** é um serviço de microblogues."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5531,20 +5664,20 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licença de conteúdos do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
@@ -5552,7 +5685,7 @@ msgstr ""
"direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -5560,7 +5693,7 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
@@ -5568,19 +5701,19 @@ msgstr ""
"licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginação"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Posteriores"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Anteriores"
@@ -5722,12 +5855,12 @@ msgid "Could not authenticate you."
msgstr "Não foi possível autenticá-lo."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Tentou revogar um código desconhecido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Falha ao eliminar código revogado."
@@ -5810,11 +5943,6 @@ msgstr "Leitura e escrita"
msgid "Default access for this application: read-only, or read-write"
msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancelar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5841,11 +5969,6 @@ msgstr "Retirar"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Anexos"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6306,14 +6429,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Actualizações por SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Ligações"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Aplicações ligadas autorizadas"
@@ -7113,24 +7236,24 @@ msgstr "Tocar"
msgid "Send a nudge to this user"
msgstr "Enviar toque a este utilizador"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Erro ao inserir perfil novo."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Erro ao inserir avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Erro ao inserir perfil remoto."
#. 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 "Nota duplicada."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir nova subscrição."
@@ -7486,17 +7609,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7504,12 +7627,12 @@ msgstr[0] "um minuto"
msgstr[1] "%d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7517,12 +7640,12 @@ msgstr[0] "uma hora"
msgstr[1] "%d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7530,12 +7653,12 @@ msgstr[0] "um dia"
msgstr[1] "%d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7543,7 +7666,7 @@ msgstr[0] "um mês"
msgstr[1] "%d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 c0063ea58..140a1ca35 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:04+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:55+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -97,14 +97,15 @@ msgstr "Salvar"
msgid "No such page."
msgstr "Esta página não existe."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -206,12 +207,13 @@ msgstr "Você e amigos"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Atualizações de %1$s e amigos no %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -238,7 +240,7 @@ msgstr "O método da API não foi encontrado!"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -314,45 +316,65 @@ msgstr "Não foi possível bloquear o usuário."
msgid "Unblock user failed."
msgstr "Não foi possível desbloquear o usuário."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Mensagens diretas de %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Todas as mensagens diretas enviadas por %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Mensagens diretas para %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Todas as mensagens diretas enviadas para %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Nenhuma mensagem de texto!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
-
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] ""
+"Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
+msgstr[1] ""
+"Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "O usuário destinatário não foi encontrado."
-#: 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 ""
"Não é possível enviar mensagens diretas para usuários que não sejam seus "
"amigos."
+#. 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 ""
+"Não envie mensagens para você mesmo(a); ao invés disso, apenas diga-a para "
+"si, discretamente."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -534,15 +556,21 @@ msgstr "grupos no %s"
msgid "Upload failed."
msgstr "O upload falhou."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "O token de autenticação especificado é inválido."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Não foi fornecido nenhum parâmetro oauth_token"
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Token inválido."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -561,38 +589,24 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Nome de usuário e/ou senha inválido(s)!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
"Erro no banco de dados durante a exclusão do usuário da aplicação OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
"Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"O token de requisição %s foi autorizado. Por favor, troque-o por um token de "
-"acesso."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "O token %s solicitado foi negado e revogado."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -601,15 +615,15 @@ msgstr "O token %s solicitado foi negado e revogado."
msgid "Unexpected form submission."
msgstr "Submissão inesperada de formulário."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Uma aplicação gostaria de se conectar à sua conta"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Permitir ou negar o acesso"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -622,11 +636,11 @@ msgstr ""
"confia."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Conta"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -635,23 +649,47 @@ msgid "Nickname"
msgstr "Usuário"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Senha"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Negar"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Cancelar"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Permitir"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Permitir ou negar o acesso às informações da sua conta."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "A confirmação do mensageiro instantâneo foi cancelada."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "O token %s solicitado foi negado e revogado."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Você não está autorizado."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Esse método requer um POST ou DELETE."
@@ -813,7 +851,8 @@ msgid "Preview"
msgstr "Pré-visualizar"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Excluir"
@@ -870,12 +909,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
@@ -888,12 +928,13 @@ msgstr "Não bloquear este usuário"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -908,9 +949,12 @@ msgstr "Bloquear este usuário"
msgid "Failed to save block information."
msgstr "Não foi possível salvar a informação de bloqueio."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1036,7 +1080,7 @@ msgstr "Você não é o dono desta aplicação."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1064,6 +1108,67 @@ msgstr "Não excluir esta aplicação"
msgid "Delete this application"
msgstr "Excluir esta aplicação"
+#. 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 "Você deve estar autenticado para sair de um grupo."
+
+#. 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 "Nenhum apelido ou identificação."
+
+#. 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 "Você não é membro deste grupo."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Não foi possível atualizar o grupo."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s deixou o grupo %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Excluir usuário"
+
+#: 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 ""
+"Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
+"deste usuário do banco de dados, sem cópia de segurança."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Não excluir esta mensagem."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Excluir este usuário"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1140,55 +1245,65 @@ msgstr "Aparência"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "A URL da logo é inválida."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não disponível: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Alterar a logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Logo do site"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo do site"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Alterar o tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema para o site."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"Você pode enviar um tema personalizado para o StatusNet, na forma de um "
"arquivo .zip."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Alterar imagem do fundo"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1198,66 +1313,66 @@ msgstr ""
"arquivo é de %1 $s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Ativado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Desativado"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ativar/desativar a imagem de fundo."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Ladrilhar a imagem de fundo"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar a cor"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar o padrão|"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaura a aparência padrão"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1267,7 +1382,7 @@ msgstr "Restaura de volta ao padrão"
msgid "Save"
msgstr "Salvar"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Salvar a aparência"
@@ -1745,7 +1860,7 @@ msgstr "Não foi possível converter o token de requisição para token de acess
msgid "Remote service uses unknown version of OMB protocol."
msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Ocorreu um erro durante a atualização do perfil remoto."
@@ -2344,10 +2459,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Você deve estar autenticado para se associar a um grupo."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Nenhum apelido ou identificação."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2594,6 +2705,11 @@ msgstr "Você não pode enviar mensagens para este usuário."
msgid "No content!"
msgstr "Nenhum conteúdo!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Não foi especificado nenhum destinatário."
@@ -2758,7 +2874,7 @@ msgstr "Por favor, somente URLs %s sobre HTTP puro."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2908,148 +3024,167 @@ msgstr "Caminhos"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Sem permissão de leitura no diretório de temas: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Sem permissão de escrita no diretório de avatares: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Sem permissão de leitura no diretório de locales: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
"Servidor SSL inválido. O comprimento máximo deve ser de 255 caracteres."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Servidor"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Nome de host do servidor do site."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Caminho"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Caminho do site"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Caminho para os locales"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Diretório dos temas"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Caminho do diretório de locales"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "URLs limpas"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Utilizar URLs limpas (mais legíveis e memorizáveis)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Tema"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Servidor de temas"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema para o site."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Caminho dos temas"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Servidor SSL"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Caminho do site"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Diretório dos temas"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Caminho do diretório de locales"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatares"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Servidor de avatares"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Caminho dos avatares"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Diretório dos avatares"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Imagens de fundo"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Servidor de imagens de fundo"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Caminho das imagens de fundo"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Diretório das imagens de fundo"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Anexos"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Nunca"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Algumas vezes"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Sempre"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Usar SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Quando usar SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Servidor SSL"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Servidor para onde devem ser direcionadas as requisições SSL"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Salvar caminhos"
@@ -3820,7 +3955,7 @@ msgstr "Organização"
msgid "Description"
msgstr "Descrição"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Estatísticas"
@@ -3962,45 +4097,45 @@ msgstr "Apelidos"
msgid "Group actions"
msgstr "Ações do grupo"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Fonte de mensagens do grupo %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Fonte de mensagens do grupo %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Fonte de mensagens do grupo %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF para o grupo %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Membros"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Nenhum)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Criado"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4016,7 +4151,7 @@ msgstr ""
"para se tornar parte deste grupo e muito mais! ([Saiba mais](%%%%doc.help%%%"
"%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4029,7 +4164,7 @@ msgstr ""
"[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
"sobre suas vidas e interesses. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administradores"
@@ -4986,7 +5121,7 @@ msgid "Plugins"
msgstr "Plugins"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Versão"
@@ -5222,7 +5357,7 @@ msgid "Unable to save tag."
msgstr "Não foi salvar gravar a categoria."
#. 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 "Você está proibido de assinar."
@@ -5342,185 +5477,185 @@ msgid "Untitled page"
msgstr "Página sem título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Navegação primária no site"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere seu e-mail, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Conectar"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Altere as configurações do site"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administrar"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Sair do site"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrar-se"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procure por pessoas ou textos"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Avisos do site"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Visualizações locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Notícia da página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Ajuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Sobre"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Termos de uso"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Privacidade"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Contato"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Mini-aplicativo"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
@@ -5528,7 +5663,7 @@ msgstr "Licença do software StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5538,7 +5673,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%). "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** é um serviço de microblog."
@@ -5547,7 +5682,7 @@ msgstr "**%%site.name%%** é um serviço de microblog."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5559,26 +5694,26 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licença do conteúdo do site"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -5586,25 +5721,25 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Paginação"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Próximo"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Anterior"
@@ -5748,12 +5883,12 @@ msgid "Could not authenticate you."
msgstr "Não foi possível autenticá-lo."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Tentou revogar um código desconhecido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Falha ao eliminar código revogado."
@@ -5837,11 +5972,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Acesso padrão para esta aplicação: somente leitura ou leitura e escrita"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Cancelar"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5868,11 +5998,6 @@ msgstr "Revogar"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Anexos"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6339,14 +6464,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Atualizações via SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Conexões"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Aplicações autorizadas conectadas"
@@ -7150,24 +7275,24 @@ msgstr "Chamar a atenção"
msgid "Send a nudge to this user"
msgstr "Chame a atenção deste usuário"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Erro ao inserir perfil novo."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Erro ao inserir avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Erro ao inserir perfil remoto."
#. 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 "Nota duplicada."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir a nova assinatura."
@@ -7522,17 +7647,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7540,12 +7665,12 @@ msgstr[0] "um minuto"
msgstr[1] "%d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7553,12 +7678,12 @@ msgstr[0] "uma hora"
msgstr[1] "%d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7566,12 +7691,12 @@ msgstr[0] "um dia"
msgstr[1] "%d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7579,7 +7704,7 @@ msgstr[0] "um mês"
msgstr[1] "%d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
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 8ccf57101..5e8edeafa 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:05+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:56+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -97,14 +97,15 @@ msgstr "Сохранить"
msgid "No such page."
msgstr "Нет такой страницы."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -204,12 +205,13 @@ msgstr "Вы и друзья"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Обновлено от %1$s и его друзей на %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -236,7 +238,7 @@ msgstr "Метод API не найден."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -312,45 +314,62 @@ msgstr "Неудача при блокировке пользователя."
msgid "Unblock user failed."
msgstr "Неудача при разблокировке пользователя."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Прямые сообщения от %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Все прямые сообщения от %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Прямые сообщения для %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Все прямые сообщения посланные для %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Отсутствует текст сообщения!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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[2] "Слишком длинно. Максимальная длина сообщения — %d знаков."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Получатель не найден."
-#: 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 ""
"Не удаётся посылать прямые сообщения пользователям, которые не являются "
"Вашими друзьями."
+#. 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 "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -533,15 +552,21 @@ msgstr "группы на %s"
msgid "Upload failed."
msgstr "Загрузка не удалась."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Задан неверный ключ для входа."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Не задан параметр oauth_token."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Неправильный токен"
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -559,35 +584,22 @@ msgstr "Неправильный токен"
msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Неверное имя или пароль."
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Ошибка базы данных при удалении пользователя приложения OAuth."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Ошибка базы данных при добавлении пользователя приложения OAuth."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Ключ запроса %s авторизован. Пожалуйста, обменяйте его на ключ доступа."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Ключ запроса %s был запрещён и аннулирован."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -596,15 +608,15 @@ msgstr "Ключ запроса %s был запрещён и аннулиров
msgid "Unexpected form submission."
msgstr "Нетиповое подтверждение формы."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Приложение хочет соединиться с вашей учётной записью"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Разрешить или запретить доступ"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -617,11 +629,11 @@ msgstr ""
"сторонним приложениям, которым вы доверяете."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Настройки"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -630,23 +642,47 @@ msgid "Nickname"
msgstr "Имя"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Запретить"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Отменить"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Разрешить"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Разрешить или запретить доступ к информации вашей учётной записи."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Подтверждение IM отменено."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Ключ запроса %s был запрещён и аннулирован."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Вы не авторизованы."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Этот метод требует POST или DELETE."
@@ -808,7 +844,8 @@ msgid "Preview"
msgstr "Просмотр"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Удалить"
@@ -864,12 +901,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Нет"
@@ -882,12 +920,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -902,9 +941,12 @@ msgstr "Заблокировать пользователя."
msgid "Failed to save block information."
msgstr "Не удаётся сохранить информацию о блокировании."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1030,7 +1072,7 @@ msgstr "Вы не являетесь владельцем этого прило
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Проблема с вашим ключом сессии."
@@ -1058,6 +1100,67 @@ msgstr "Не удаляйте это приложение"
msgid "Delete this application"
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 "Вы должны авторизоваться, чтобы покинуть группу."
+
+#. 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 "Нет имени или 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 "Вы не являетесь членом этой группы."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s покинул группу %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Удалить пользователя"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Не удалять эту запись"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Удалить этого пользователя"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1134,53 +1237,63 @@ msgstr "Оформление"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Неверный URL логотипа."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Неверный URL логотипа."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Тема не доступна: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Изменить логотип"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Логотип сайта"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Логотип сайта"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Изменить тему"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Тема сайта"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Тема для сайта."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Особая тема"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Вы можете загрузить особую тему StatusNet в виде ZIP-архива."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображения"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1190,66 +1303,66 @@ msgstr ""
"составляет %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Включить"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Отключить"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Включить или отключить показ фонового изображения."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Растянуть фоновое изображение"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Боковая панель"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Расширенный"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Особый CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Восстановить оформление по умолчанию"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Восстановить значения по умолчанию"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1259,7 +1372,7 @@ msgstr "Восстановить значения по умолчанию"
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Сохранить оформление"
@@ -1742,7 +1855,7 @@ msgstr "Не удаётся преобразовать ключ запроса
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Удалённый сервис использует неизвестную версию протокола OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Ошибка обновления удалённого профиля."
@@ -2340,10 +2453,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Вы должны авторизоваться для вступления в группу."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Нет имени или ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2587,6 +2696,11 @@ msgstr "Вы не можете послать сообщение этому по
msgid "No content!"
msgstr "Нет контента!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Нет адресата."
@@ -2746,7 +2860,7 @@ msgstr "Только %s URL в простом HTTP, пожалуйста."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Неподдерживаемый формат данных."
@@ -2896,147 +3010,166 @@ msgstr "Пути"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Директория тем не доступна для чтения: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Директория аватар не доступна для записи: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Директория фоновых изображений не доступна для записи: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Директория локализаций не доступна для чтения: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Неверный SSL-сервер. Максимальная длина составляет 255 символов."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Сервер"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Имя хоста сервера сайта."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Путь"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Путь к сайту"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Путь к локализациям"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Директория темы"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Путь к директории локализаций"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Короткие URL"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Тема"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Сервер темы"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Тема для сайта."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Путь темы"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-сервер"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Путь к сайту"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Директория темы"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Путь к директории локализаций"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Аватары"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Сервер аватар"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Путь к аватарам"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Директория аватар"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Фоновые изображения"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Сервер фонового изображения"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Путь к фоновому изображению"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Директория фонового изображения"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Вложения"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Никогда"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Иногда"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Всегда"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Использовать SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Когда использовать SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-сервер"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Сервер, которому направлять SSL-запросы"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Сохранить пути"
@@ -3800,7 +3933,7 @@ msgstr "Организация"
msgid "Description"
msgstr "Описание"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистика"
@@ -3943,45 +4076,45 @@ msgstr "Алиасы"
msgid "Group actions"
msgstr "Действия группы"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Лента записей группы %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Лента записей группы %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Лента записей группы %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF для группы %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Участники"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Все участники"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Создано"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3997,7 +4130,7 @@ msgstr ""
"action.register%%%%), чтобы стать участником группы и получить множество "
"других возможностей! ([Читать далее](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4010,7 +4143,7 @@ msgstr ""
"обеспечении [StatusNet](http://status.net/). Участники обмениваются "
"короткими сообщениями о своей жизни и интересах. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Администраторы"
@@ -4969,7 +5102,7 @@ msgid "Plugins"
msgstr "Плагины"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Версия"
@@ -5206,7 +5339,7 @@ msgid "Unable to save tag."
msgstr "Не удаётся сохранить тег."
#. 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 "Вы заблокированы от подписки."
@@ -5326,185 +5459,185 @@ msgid "Untitled page"
msgstr "Страница без названия"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Главная навигация"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Личное"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватар, пароль, профиль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Соединить"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Настройки"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Пригласить"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Выйти"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Выход"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Создать новый аккаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Регистрация"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Вход"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Помощь"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Поиск"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Уведомление сайта"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Локальные виды"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Новая запись"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Помощь"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "О проекте"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "ЧаВо"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "TOS"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Пользовательское соглашение"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Исходный код"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Контактная информация"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
@@ -5512,7 +5645,7 @@ msgstr "StatusNet лицензия"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5522,7 +5655,7 @@ msgstr ""
"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -5531,7 +5664,7 @@ msgstr "**%%site.name%%** — сервис микроблогинга."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5544,27 +5677,27 @@ msgstr ""
"licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -5572,25 +5705,25 @@ 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Разбиение на страницы"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Туда"
@@ -5732,12 +5865,12 @@ msgid "Could not authenticate you."
msgstr "Не удаётся произвести аутентификацию."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Попытка отменить неизвестный ключ."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Не удаётся удалить аннулированный ключ."
@@ -5822,11 +5955,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Доступ по умолчанию для этого приложения: только чтение или чтение и запись"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Отменить"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5853,11 +5981,6 @@ msgstr "Отозвать"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Вложения"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6324,14 +6447,14 @@ msgstr "СМС"
msgid "Updates by SMS"
msgstr "Обновления по СМС"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Соединения"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Авторизованные соединённые приложения"
@@ -7128,24 +7251,24 @@ msgstr "«Подтолкнуть»"
msgid "Send a nudge to this user"
msgstr "«Подтолкнуть» этого пользователя"
-#: lib/oauthstore.php:283
+#: 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 "Не удаётся вставить новую подписку."
@@ -7500,17 +7623,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "пару секунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7519,12 +7642,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "около часа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7533,12 +7656,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "около дня назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7547,12 +7670,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "около месяца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7561,7 +7684,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 5acb59d59..f7661107f 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-10-09 14:04+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+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"
@@ -86,14 +86,15 @@ msgstr ""
msgid "No such page."
msgstr ""
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -187,12 +188,13 @@ msgstr ""
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -219,7 +221,7 @@ msgstr ""
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -291,43 +293,58 @@ msgstr ""
msgid "Unblock user failed."
msgstr ""
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr ""
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr ""
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr ""
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr ""
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:127
#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
+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 ""
-#: 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 ""
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -507,15 +524,19 @@ msgstr ""
msgid "Upload failed."
msgstr ""
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+msgid "Invalid request token or verifier."
+msgstr ""
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+msgid "Invalid request token."
msgstr ""
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -533,34 +554,22 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr ""
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr ""
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -569,15 +578,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr ""
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -586,11 +595,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr ""
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -599,21 +608,43 @@ msgid "Nickname"
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr ""
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
msgstr ""
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr ""
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+msgid "Authorize access to your account information."
+msgstr ""
+
+#: actions/apioauthauthorize.php:433
+msgid "Authorization canceled."
+msgstr ""
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, php-format
+msgid "You have successfully authorized %s."
+msgstr ""
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
@@ -776,7 +807,8 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr ""
@@ -829,12 +861,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr ""
@@ -847,12 +880,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr ""
@@ -867,9 +901,12 @@ msgstr ""
msgid "Failed to save block information."
msgstr ""
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -995,7 +1032,7 @@ msgstr ""
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1020,6 +1057,59 @@ msgstr ""
msgid "Delete this application"
msgstr ""
+#. 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 ""
+
+#. 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.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+msgid "Delete group"
+msgstr ""
+
+#: 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: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1092,53 +1182,61 @@ msgstr ""
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr ""
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr ""
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr ""
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr ""
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+msgid "SSL logo"
+msgstr ""
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr ""
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr ""
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr ""
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1146,66 +1244,66 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr ""
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr ""
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr ""
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr ""
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr ""
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1215,7 +1313,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1677,7 +1775,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr ""
@@ -2212,10 +2310,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr ""
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2454,6 +2548,11 @@ msgstr ""
msgid "No content!"
msgstr ""
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr ""
@@ -2605,7 +2704,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr ""
@@ -2753,147 +2852,161 @@ msgstr ""
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr ""
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr ""
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr ""
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr ""
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
+#: actions/pathsadminpanel.php:247
+msgid "Locale Directory"
msgstr ""
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+msgid "Server for themes"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
msgstr ""
-#: actions/pathsadminpanel.php:279
-msgid "Avatars"
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:284
-msgid "Avatar server"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+msgid "SSL path"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+msgid "Directory"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
msgstr ""
#: actions/pathsadminpanel.php:288
-msgid "Avatar path"
+msgid "Avatars"
msgstr ""
-#: actions/pathsadminpanel.php:292
-msgid "Avatar directory"
+#: actions/pathsadminpanel.php:293
+msgid "Avatar server"
msgstr ""
-#: actions/pathsadminpanel.php:301
-msgid "Backgrounds"
+#: actions/pathsadminpanel.php:297
+msgid "Avatar path"
msgstr ""
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
+#: actions/pathsadminpanel.php:301
+msgid "Avatar directory"
msgstr ""
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
+#: actions/pathsadminpanel.php:310
+msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
msgstr ""
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr ""
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr ""
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr ""
@@ -3599,7 +3712,7 @@ msgstr ""
msgid "Description"
msgstr ""
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr ""
@@ -3732,45 +3845,45 @@ msgstr ""
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr ""
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr ""
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr ""
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr ""
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr ""
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr ""
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr ""
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3780,7 +3893,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3789,7 +3902,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr ""
@@ -4680,7 +4793,7 @@ msgid "Plugins"
msgstr ""
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr ""
@@ -4908,7 +5021,7 @@ msgid "Unable to save tag."
msgstr ""
#. 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 ""
@@ -5028,185 +5141,185 @@ msgid "Untitled page"
msgstr ""
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr ""
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr ""
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr ""
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr ""
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, 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:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr ""
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr ""
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr ""
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr ""
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr ""
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr ""
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr ""
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr ""
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr ""
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr ""
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr ""
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr ""
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr ""
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr ""
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr ""
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr ""
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr ""
@@ -5214,7 +5327,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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5222,7 +5335,7 @@ msgid ""
msgstr ""
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr ""
@@ -5231,7 +5344,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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5240,50 +5353,50 @@ msgid ""
msgstr ""
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr ""
@@ -5423,12 +5536,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5511,11 +5624,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr ""
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5542,11 +5650,6 @@ msgstr ""
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr ""
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -5959,13 +6062,13 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
msgctxt "MENU"
msgid "Connections"
msgstr ""
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -6650,24 +6753,24 @@ msgstr ""
msgid "Send a nudge to this user"
msgstr ""
-#: lib/oauthstore.php:283
+#: 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 ""
@@ -7018,17 +7121,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7036,12 +7139,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7049,12 +7152,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7062,12 +7165,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7075,7 +7178,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index d529ea4bb..2223fae7b 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:06+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:57+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +93,15 @@ msgstr "Spara"
msgid "No such page."
msgstr "Ingen sådan sida"
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -200,12 +201,13 @@ msgstr "Du och vänner"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Uppdateringar från %1$s och vänner på %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -232,7 +234,7 @@ msgstr "API-metod hittades inte."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -306,43 +308,61 @@ msgstr "Blockering av användare misslyckades."
msgid "Unblock user failed."
msgstr "Hävning av blockering av användare misslyckades."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Direktmeddelanden från %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Alla direktmeddelanden skickade från %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Direktmeddelande till %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Alla direktmeddelanden skickade till %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Ingen meddelandetext!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Detta är för långt. Maximal meddelandestorlek är %d tecken."
+msgstr[1] "Detta är för långt. Maximal meddelandestorlek är %d tecken."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Mottagare hittades inte."
-#: 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 inte skicka direktmeddelanden till användare som inte är din vän."
+#. 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 ""
+"Skicka inte meddelande till dig själv; viska lite tyst till dig själv "
+"istället."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -523,15 +543,21 @@ msgstr "grupper på %s"
msgid "Upload failed."
msgstr "Uppladdning misslyckades."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Ogiltig inloggnings-token angiven."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Ingen oauth_token-parameter angiven."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Ogiltig token."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -549,34 +575,22 @@ msgstr "Ogiltig token."
msgid "There was a problem with your session token. Try again, please."
msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Ogiltigt smeknamn / lösenord!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Databasfel vid borttagning av OAuth-applikationsanvändare."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "Begäran-token %s har godkänts. Byt ut den mot en åtkomst-token."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Begäran-token %s har nekats och återkallats."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -585,15 +599,15 @@ msgstr "Begäran-token %s har nekats och återkallats."
msgid "Unexpected form submission."
msgstr "Oväntat inskick av formulär."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "En applikation skulle vilja ansluta till ditt konto"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Tillåt eller neka åtkomst"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -605,11 +619,11 @@ msgstr ""
"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Konto"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -618,23 +632,47 @@ msgid "Nickname"
msgstr "Smeknamn"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Lösenord"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Neka"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Avbryt"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Tillåt"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Tillåt eller neka åtkomst till din kontoinformation."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Bekräftelse för snabbmeddelanden avbruten."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Begäran-token %s har nekats och återkallats."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Du har inte tillstånd."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Denna metod kräver en POST eller en DELETE."
@@ -796,7 +834,8 @@ msgid "Preview"
msgstr "Förhandsgranska"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Ta bort"
@@ -852,12 +891,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Nej"
@@ -870,12 +910,13 @@ msgstr "Blockera inte denna användare"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -890,9 +931,12 @@ msgstr "Blockera denna användare"
msgid "Failed to save block information."
msgstr "Misslyckades att spara blockeringsinformation."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1019,7 +1063,7 @@ msgstr "Du är inte ägaren av denna applikation."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -1047,6 +1091,67 @@ msgstr "Ta inte bort denna applikation"
msgid "Delete this application"
msgstr "Ta bort denna applikation"
+#. 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 "Du måste vara inloggad för att lämna en grupp."
+
+#. 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 "Inget smeknamn eller 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 "Du är inte en medlem i denna grupp."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Kunde inte uppdatera grupp."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s lämnade grupp %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Ta bort användare"
+
+#: 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 ""
+"Är du säker på att du vill ta bort denna användare? Det kommer rensa all "
+"data om användaren från databasen, utan en säkerhetskopia."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Ta inte bort denna notis"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Ta bort denna användare"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1123,53 +1228,63 @@ msgstr "Utseende"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Ogiltig webbadress för logtyp."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Ogiltig webbadress för logtyp."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema inte tillgängligt: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Byt logotyp"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Webbplatslogotyp"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Webbplatslogotyp"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Byt tema"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Webbplatstema"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Tema för webbplatsen."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Anpassat tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan ladda upp ett eget StatusNet-tema som ett .ZIP-arkiv."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Ändra bakgrundsbild"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrund"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1179,66 +1294,66 @@ msgstr ""
"filstorleken är %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Sätt på eller stäng av bakgrundsbild."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Upprepa bakgrundsbild"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Byt färger"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Innehåll"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidofält"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Länkar"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Avancerat"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Anpassad CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Använd standardvärden"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Återställ standardutseende"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Återställ till standardvärde"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1248,7 +1363,7 @@ msgstr "Återställ till standardvärde"
msgid "Save"
msgstr "Spara"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Spara utseende"
@@ -1722,7 +1837,7 @@ msgstr "Kunde inte konvertera token för begäran till token för åtkomst."
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Fel vid uppdatering av fjärrprofil."
@@ -2318,10 +2433,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Inget smeknamn eller ID."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2564,6 +2675,11 @@ msgstr "Du kan inte skicka ett meddelande till den användaren."
msgid "No content!"
msgstr "Inget innehåll!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Ingen mottagare angiven."
@@ -2726,7 +2842,7 @@ msgstr "Endast %s-webbadresser över vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2874,148 +2990,167 @@ msgstr "Sökvägar"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Katalog med teman är inte läsbar: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Katalog med avatarer är inte skrivbar: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Katalog med bakgrunder är inte skrivbar: %s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Katalog med lokaliseringfiler (locales) är inte läsbar. %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Webbplats"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Server"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Värdnamn för webbplatsens server."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Sökväg"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Sökväg till webbplats"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Sökväg till lokaliseringfiler (locales)"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Katalog med teman"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Katalogsökväg till lokaliseringfiler (locales)"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Utsmyckade URL:er"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
"Skall utsmyckade URL:er användas (mer läsbara och lättare att komma ihåg)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Teman"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Server med teman"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Tema för webbplatsen."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Sökväg till teman"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-server"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Sökväg till webbplats"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Katalog med teman"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Katalogsökväg till lokaliseringfiler (locales)"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Avatarer"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Server med avatarer"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Sökväg till avatarer"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Katalog med avatarer"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Bakgrunder"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Server med bakgrunder"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Sökväg till bakgrunder"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Katalog med bakgrunder"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Bilagor"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Aldrig"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Ibland"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Alltid"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Använd SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "När SSL skall användas"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-server"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Server att dirigera SSL-begäran till"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Spara sökvägar"
@@ -3782,7 +3917,7 @@ msgstr "Organisation"
msgid "Description"
msgstr "Beskrivning"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Statistik"
@@ -3925,45 +4060,45 @@ msgstr "Alias"
msgid "Group actions"
msgstr "Åtgärder för grupp"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Flöde av notiser för %s grupp (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Flöde av notiser för %s grupp (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Flöde av notiser för %s grupp (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF för %s grupp"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Medlemmar"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 "(Ingen)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Alla medlemmar"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Skapad"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3978,7 +4113,7 @@ msgstr ""
"sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en "
"del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3991,7 +4126,7 @@ msgstr ""
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Administratörer"
@@ -4945,7 +5080,7 @@ msgid "Plugins"
msgstr "Insticksmoduler"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Version"
@@ -5179,7 +5314,7 @@ msgid "Unable to save tag."
msgstr "Kunde inte spara tagg."
#. 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 "Du har blivit utestängd från att prenumerera."
@@ -5299,185 +5434,185 @@ msgid "Untitled page"
msgstr "Namnlös sida"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Personligt"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Anslut till tjänster"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Anslut"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Administratör"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Bjud in"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Logga ut"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Skapa ett konto"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Registrera"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Logga in"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Hjälp"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Sök"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Webbplatsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Lokala vyer"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Sidnotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Hjälp"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Om"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "Frågor & svar"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Användarvillkor"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Sekretess"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Källa"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Kontakt"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Emblem"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
@@ -5485,7 +5620,7 @@ msgstr "Programvarulicens för StatusNet"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5495,7 +5630,7 @@ msgstr ""
"%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -5504,7 +5639,7 @@ msgstr "**%%site.name%%** är en mikrobloggtjänst."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5516,51 +5651,51 @@ msgstr ""
"fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Innehåll och data av %1$s är privat och konfidensiell."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
#. 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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Numrering av sidor"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Senare"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Tidigare"
@@ -5701,12 +5836,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5790,11 +5925,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Avbryt"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5821,11 +5951,6 @@ msgstr "Återkalla"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Bilagor"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6287,14 +6412,14 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "Uppdateringar via SMS"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Anslutningar"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Tillåt anslutna applikationer"
@@ -7091,24 +7216,24 @@ msgstr "Knuffa"
msgid "Send a nudge to this user"
msgstr "Skicka en knuff till denna användare"
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
msgid "Error inserting new profile."
msgstr "Fel vid infogning av ny profil."
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
msgid "Error inserting avatar."
msgstr "Fel vid infogning av avatar."
-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
msgstr "Fel vid infogning av fjärrprofil."
#. 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 "Duplicera notis."
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
msgstr "Kunde inte infoga ny prenumeration."
@@ -7462,17 +7587,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7480,12 +7605,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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7493,12 +7618,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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7506,12 +7631,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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7519,7 +7644,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:1184
+#: lib/util.php:1194
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 f5475c9ea..dc186dd5d 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:07+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:58+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -91,14 +91,15 @@ msgstr "భద్రపరచు"
msgid "No such page."
msgstr "అటువంటి పేజీ లేదు."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -193,12 +194,13 @@ msgstr "మీరు మరియు మీ స్నేహితులు"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -226,7 +228,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -302,43 +304,59 @@ msgstr "వాడుకరి నిరోధం విఫలమైంది."
msgid "Unblock user failed."
msgstr "వాడుకరి నిరోధం విఫలమైంది."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "%s నుండి నేరు సందేశాలు"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s నుండి పంపిన అన్ని నేరు సందేశాలు"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "%s కి నేరు సందేశాలు"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%sకి పంపిన అన్ని నేరు సందేశాలు"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "సందేశపు పాఠ్యం లేదు!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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 అక్షరాలు."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "అందుకోవాల్సిన వాడుకరి కనబడలేదు."
-#: 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 "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు."
+#. 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 "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -518,15 +536,21 @@ msgstr "%s పై గుంపులు"
msgid "Upload failed."
msgstr "ఎక్కింపు విఫలమైంది."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "సందేశపు విషయం సరైనది కాదు"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "తప్పుడు పాత్ర."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -544,35 +568,23 @@ msgstr "తప్పుడు పాత్ర."
msgid "There was a problem with your session token. Try again, please."
msgstr ""
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "తప్పుడు పేరు / సంకేతపదం!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -581,15 +593,15 @@ msgstr ""
msgid "Unexpected form submission."
msgstr ""
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "ఒక ఉపకరణం మీ ఖాతాకి అనుసంధానమవ్వాలనుకుంటూంది."
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "అనుమతిని ఇవ్వండి లేదా తిరస్కరించండి"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -598,11 +610,11 @@ msgid ""
msgstr ""
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "ఖాతా"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -611,23 +623,47 @@ msgid "Nickname"
msgstr "పేరు"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "సంకేతపదం"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "తిరస్కరించు"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "రద్దుచేయి"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "అనుమతించు"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM నిర్ధారణ రద్దయింది."
+
+#: actions/apioauthauthorize.php:435
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr ""
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "మీకు అధీకరణ లేదు."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -790,7 +826,8 @@ msgid "Preview"
msgstr "మునుజూపు"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "తొలగించు"
@@ -845,12 +882,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "కాదు"
@@ -863,12 +901,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "అవును"
@@ -883,9 +922,12 @@ msgstr "ఈ వాడుకరిని నిరోధించు"
msgid "Failed to save block information."
msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1011,7 +1053,7 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1038,6 +1080,67 @@ msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
msgid "Delete this application"
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 "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
+
+#. 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 "Jabber 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 "మీరు ఈ గుంపులో సభ్యులు కాదు."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "వాడుకరిని తొలగించు"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "ఈ నోటీసుని తొలగించకు"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "ఈ వాడుకరిని తొలగించు"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1112,54 +1215,64 @@ msgstr "రూపురేఖలు"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "చిహ్నపు URL చెల్లదు."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "చిహ్నపు URL చెల్లదు."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "అలంకారం అందుబాటులో లేదు: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "చిహ్నాన్ని మార్చు"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "సైటు చిహ్నం"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "సైటు చిహ్నం"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "అలంకారాన్ని మార్చు"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "సైటు అలంకారం"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "సైటుకి అలంకారం."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
#, fuzzy
msgid "Custom theme"
msgstr "సైటు అలంకారం"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "నేపథ్యం"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1167,70 +1280,70 @@ msgid ""
msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "ఆన్"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "ఆఫ్"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
#, fuzzy
msgid "Turn background image on or off."
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
#, fuzzy
msgid "Tile background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "రంగులను మార్చు"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "విషయం"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "పక్కపట్టీ"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "పాఠ్యం"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "లంకెలు"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "ఉన్నత"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "ప్రత్యేక CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "అప్రమేయాలని ఉపయోగించు"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
#, fuzzy
msgid "Restore default designs"
msgstr "అప్రమేయాలని ఉపయోగించు"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
#, fuzzy
msgid "Reset back to default"
msgstr "అప్రమేయాలని ఉపయోగించు"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1240,7 +1353,7 @@ msgstr "అప్రమేయాలని ఉపయోగించు"
msgid "Save"
msgstr "భద్రపరచు"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపురేఖలని భద్రపరచు"
@@ -1719,7 +1832,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
@@ -2299,10 +2412,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Jabber ID లేదు."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2543,6 +2652,11 @@ msgstr "ఈ వాడుకరికి మీరు సందేశాన్న
msgid "No content!"
msgstr "విషయం లేదు!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం %d అక్షరాలు."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "ఎవరికి పంపించాలో పేర్కొనలేదు."
@@ -2701,7 +2815,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr ""
@@ -2853,152 +2967,168 @@ msgstr "త్రోవలు"
msgid "Path and server settings for this StatusNet site"
msgstr ""
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "అలంకారం అందుబాటులో లేదు: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "అవతారాల సంచయం"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "నేపథ్యాల సంచయం"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "హోమ్ పేజీ URL సరైనది కాదు."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
#, fuzzy
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "సైటు"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "సేవకి"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "త్రోవ"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "సైటు అలంకారం"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "అలంకార సంచయం"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "అలంకారం"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "అలంకారాల సేవకి"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "సైటుకి అలంకారం."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:268
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "సేవకి"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
#, fuzzy
-msgid "Theme path"
-msgstr "అలంకారం"
+msgid "SSL path"
+msgstr "సైటు అలంకారం"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "అలంకార సంచయం"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
+msgstr ""
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "అవతారాలు"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "అవతారాల సేవకి"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "అవతారాన్ని తాజాకరించాం."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "అవతారాల సంచయం"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "నేపథ్యాలు"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "నేపథ్యాల సేవకి"
-
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "నేపథ్యం"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "నేపథ్యాల సంచయం"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "జోడింపులు"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
#, fuzzy
msgid "SSL"
msgstr "SSLని ఉపయోగించు"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "సేవకి"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "కొన్నిసార్లు"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "ఎల్లప్పుడూ"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "SSLని ఉపయోగించు"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "SSLని ఎప్పుడు ఉపయోగించాలి"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "సేవకి"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "కొత్త సందేశం"
@@ -3755,7 +3885,7 @@ msgstr "సంస్ధ"
msgid "Description"
msgstr "వివరణ"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "గణాంకాలు"
@@ -3893,45 +4023,45 @@ msgstr "మారుపేర్లు"
msgid "Group actions"
msgstr "గుంపు చర్యలు"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "%s గుంపు"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "సభ్యులు"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "అందరు సభ్యులూ"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "సృష్టితం"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3947,7 +4077,7 @@ msgstr ""
"చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
"doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3962,7 +4092,7 @@ msgstr ""
"చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
"doc.help%%%%))"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "నిర్వాహకులు"
@@ -4889,7 +5019,7 @@ msgid "Plugins"
msgstr "ప్లగిన్లు"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "సంచిక"
@@ -5122,7 +5252,7 @@ msgid "Unable to save tag."
msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
#. 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 "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
@@ -5244,186 +5374,186 @@ msgid "Untitled page"
msgstr "శీర్షికలేని పేజీ"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "వ్యక్తిగత"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
#, fuzzy
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "అనుసంధానించు"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "నిర్వాహకులు"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "ఆహ్వానించు"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "సైటు నుండి నిష్క్రమించు"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "నిష్క్రమించు"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "ఖాతాని సృష్టించుకోండి"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "నమోదు"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "సైటు లోనికి ప్రవేశించండి"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "ప్రవేశించు"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "సహాయం"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "వెతుకు"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "సైటు గమనిక"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "స్థానిక వీక్షణలు"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "పేజీ గమనిక"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "ద్వితీయ సైటు మార్గదర్శిని"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "సహాయం"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "గురించి"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "ప్రశ్నలు"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "సేవా నియమాలు"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "అంతరంగికత"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "మూలము"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "సంప్రదించు"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "బాడ్జి"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
@@ -5431,7 +5561,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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5441,7 +5571,7 @@ msgstr ""
"అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -5450,7 +5580,7 @@ msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగి
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5462,50 +5592,50 @@ msgstr ""
"పై నడుస్తుంది."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "పేజీకరణ"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "ఇంతక్రితం"
@@ -5648,12 +5778,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5737,11 +5867,6 @@ msgstr "చదవడం-వ్రాయడం"
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "రద్దుచేయి"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5769,11 +5894,6 @@ msgstr "తొలగించు"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "జోడింపులు"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6202,14 +6322,14 @@ msgstr "SSLని ఉపయోగించు"
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "అనుసంధానాలు"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "అధీకృత అనుసంధాన ఉపకరణాలు"
@@ -6994,24 +7114,24 @@ msgstr "బాడ్జి"
msgid "Send a nudge to this user"
msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
-#: lib/oauthstore.php:283
+#: 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 "కొత్త చందాని చేర్చలేకపోయాం."
@@ -7366,17 +7486,17 @@ msgid "Moderator"
msgstr "సమన్వయకర్త"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7384,12 +7504,12 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
msgstr[1] "సుమారు %d నిమిషాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7397,12 +7517,12 @@ msgstr[0] "ఒక గంట"
msgstr[1] "%d గంటల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7410,12 +7530,12 @@ msgstr[0] "ఒక రోజు"
msgstr[1] "%d రోజుల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7423,7 +7543,7 @@ msgstr[0] "ఒక నెల"
msgstr[1] "%d నెలల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 5c859186d..e33fd56dd 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:08+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:50:59+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -93,14 +93,15 @@ msgstr "Kaydet"
msgid "No such page."
msgstr "Böyle bir kullanıcı yok."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -167,6 +168,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
+"Daha fazla kişiye abone olmayı deneyin, [bir gruba katılın](%%action.groups%"
+"%) veya kendiniz bir şeyler yazın."
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
#: actions/all.php:146
@@ -175,6 +178,9 @@ 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 ""
+"Profil sayfalarından insanları [dürtmeyi %1$s](../%2$s) deneyebilirsiniz "
+"veya [onlara bir şeyler yazabilirsiniz](%%%%action.newnotice%%%%?"
+"status_textarea=%3$s)"
#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
@@ -182,6 +188,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to them."
msgstr ""
+"Neden bir [hesap oluşturup](%%%%action.register%%%%) sonrasında %s "
+"kullanıcısını dürtmüyor veya onlara durum mesajı yazmıyorsunuz."
#. TRANS: H1 text
#: actions/all.php:182
@@ -194,14 +202,15 @@ msgstr "Sen ve arkadaşların"
#: actions/apitimelinehome.php:122
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -229,20 +238,22 @@ msgstr "Onay kodu bulunamadı."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: 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
msgid "This method requires a POST."
-msgstr ""
+msgstr "Bu yöntem bir POST gerektirir."
#: actions/apiaccountupdatedeliverydevice.php:107
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
+"sms, im, none değerlerinden birine sahip 'device' isimli bir parametre "
+"belirtmelisiniz."
#: actions/apiaccountupdatedeliverydevice.php:134
#, fuzzy
@@ -275,6 +286,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
+"Sunucu, şu anki yapılandırması dolayısıyla bu kadar çok POST verisiyle (%s "
+"bytes) başa çıkamıyor."
#: actions/apiaccountupdateprofilebackgroundimage.php:137
#: actions/apiaccountupdateprofilebackgroundimage.php:147
@@ -304,43 +317,57 @@ msgstr "Kullanıcıyı engelleme başarısız oldu."
msgid "Unblock user failed."
msgstr "Kullanıcının engellemesini kaldırma başarısız oldu."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "%s kullanıcısından özel mesajlar"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s tarafından gönderilmiş tüm özel mesajlar"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "%s kullanıcısına özel mesaj"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "%s kullanıcısına gönderilmiş tüm özel mesajlar"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Mesaj metni yok!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Bu çok uzun. Maksimum mesaj boyutu %d karakterdir."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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] "Bu çok uzun. Maksimum mesaj boyutu %d karakterdir."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Alıcı kullanıcı bulunamadı."
-#: 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 "Arkadaşınız olmayan kullanıcılara özel mesaj gönderemezsiniz."
+#. 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 ""
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -441,7 +468,7 @@ msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Çok fazla diğerisim! En fazla %d."
#: actions/apigroupcreate.php:268
#, php-format
@@ -450,14 +477,14 @@ msgstr "Geçersiz büyüklük."
#: actions/apigroupcreate.php:277 actions/editgroup.php:232
#: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
#: actions/apigroupcreate.php:290 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
@@ -478,9 +505,9 @@ msgstr "Bu gruptan yönetici tarafından engellendiniz."
#. 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:350
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
#: actions/apigroupleave.php:116
msgid "You are not a member of this group."
@@ -502,9 +529,9 @@ msgstr "%s kullanıcısının grupları"
#. 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
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Bize o profili yollamadınız"
+msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -522,16 +549,21 @@ msgstr "%s üzerindeki gruplar"
msgid "Upload failed."
msgstr "Yükleme başarısız."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Geçersiz durum mesajı"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "Hiçbir oauth_token parametresi sağlanmıyor."
-#: actions/apioauthauthorize.php:106
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
#, fuzzy
-msgid "Invalid token."
-msgstr "Geçersiz büyüklük."
+msgid "Invalid request token."
+msgstr "Geçersiz belirteç."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -547,38 +579,24 @@ msgstr "Geçersiz büyüklük."
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "Oturum belirtecinizde bir sorun var. Lütfen, tekrar deneyin."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Geçersiz kullanıcı adı / parola!"
-#: actions/apioauthauthorize.php:159
-#, fuzzy
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
-msgstr "Kullanıcı ayarlamada hata oluştu."
+msgstr "OAuth uygulama kullanıcısı silerken veritabanı hatası."
-#: actions/apioauthauthorize.php:185
-#, fuzzy
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr ""
+msgstr "OAuth uygulama kullanıcısı eklerken veritabanı hatası."
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -587,28 +605,32 @@ msgstr ""
msgid "Unexpected form submission."
msgstr "Beklenmeğen form girdisi."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Bir uygulama hesabınıza bağlanmak istiyor"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
-msgstr ""
+msgstr "Erişime izin verin ya da erişimi engelleyin"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> 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>%2$s</strong> tarafından sunulan <strong>%1$s</strong> uygulaması, %4"
+"$s hesap verileriniz üzerinde şunları yapmak istiyor: <strong>%3$s</strong>. "
+"%4$s hesabınıza erişmek için yalnızca güvendiğiniz üçüncü şahıslara izin "
+"vermelisiniz."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Hesap"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -617,26 +639,50 @@ msgid "Nickname"
msgstr "Takma ad"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Parola"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Reddet"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "İptal et"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "İzin Ver"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
+msgstr "Hesap bilgilerinize erişim için izin verin ya da erişimi reddedin."
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Onay kodu yok."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "İstek belirteci %s, reddedildi ve iptal edildi."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Takip talebine izin verildi"
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
msgstr ""
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr " Bu yöntem bir POST veya DELETE gerektirir."
#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
@@ -797,7 +843,8 @@ msgid "Preview"
msgstr "Önizleme"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Sil"
@@ -854,12 +901,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Hayır"
@@ -872,12 +920,13 @@ msgstr "Bu kullanıcıyı engelleme"
#. 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Evet"
@@ -892,9 +941,12 @@ msgstr "Bu kullanıcıyı engelle"
msgid "Failed to save block information."
msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1020,7 +1072,7 @@ msgstr "Bu uygulamanın sahibi değilsiniz."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr ""
@@ -1048,6 +1100,68 @@ msgstr "Bu uygulamayı silme"
msgid "Delete this application"
msgstr "Bu uygulamayı sil"
+#. 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 "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
+
+#. 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 "Takma ad yok"
+
+#. 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 "Bu grubun bir üyesi değilsiniz."
+
+#. 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
+msgid "Could not delete group %s."
+msgstr "Grup güncellenemedi."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s'in %2$s'deki durum mesajları "
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Kullanıcıyı sil"
+
+#: 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 ""
+"Bu kullanıcıyı silmek istediğinizden emin misiniz? Bu, veritabanından "
+"kullanıcıya ait tüm verileri herhangi bir yedek olmaksızın temizleyecektir."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Bu durum mesajını silme"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Bu kullanıcıyı sil"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1124,53 +1238,63 @@ msgstr "Dizayn"
msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Geçersiz logo bağlantısı."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Geçersiz logo bağlantısı."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Tema mevcut değil: %s"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Değiştir"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Site logosu"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Site logosu"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Temayı değiştir"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Site teması"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Site için tema."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Özel tema"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Özel bir StatusNet temasını .ZIP arşivi olarak yükleyebilirsiniz."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Arkaplan resmini değiştir"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arkaplan"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1180,66 +1304,66 @@ msgstr ""
"$s'dir."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Açık"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Kapalı"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Arkaplan resmini açın ya da kapatın."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Arkaplan resmini döşe"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Renkleri değiştir"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "İçerik"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Kenar Çubuğu"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Metin"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Bağlantılar"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Gelişmiş"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Özel CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Öntanımlıları kullan"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Öntanımlıya geri dön"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1249,7 +1373,7 @@ msgstr "Öntanımlıya geri dön"
msgid "Save"
msgstr "Kaydet"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Dizaynı kaydet"
@@ -1728,7 +1852,7 @@ msgstr ""
msgid "Remote service uses unknown version of OMB protocol."
msgstr "OMB protokolünün bilinmeğen sürümü."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
#, fuzzy
msgid "Error updating remote profile."
msgstr "Uzaktaki profili güncellemede hata oluştu"
@@ -2290,11 +2414,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Gruba katılmak için giriş yapmalısınız."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Takma ad yok"
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2543,6 +2662,11 @@ msgstr "Bize o profili yollamadınız"
msgid "No content!"
msgstr "İçerik yok!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Bu çok uzun. Maksimum mesaj boyutu %d karakterdir."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr ""
@@ -2696,7 +2820,7 @@ msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Desteklenen bir veri biçimi değil."
@@ -2849,151 +2973,169 @@ msgstr "Yollar"
msgid "Path and server settings for this StatusNet site"
msgstr "Bu StatusNet sitesi için yol ve sunucu ayarları"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, fuzzy, php-format
msgid "Theme directory not readable: %s."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, fuzzy, php-format
msgid "Avatar directory not writable: %s."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, fuzzy, php-format
msgid "Background directory not writable: %s."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, fuzzy, php-format
msgid "Locales directory not readable: %s."
msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Site"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Sunucu"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr ""
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Yol"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Site yolu"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr ""
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Avatar güncellendi."
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr ""
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr ""
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr ""
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr ""
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Site için tema."
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "Sunucu"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Site yolu"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
+msgstr "Avatar güncellendi."
+
+#: actions/pathsadminpanel.php:281
+msgid "Directory where themes are located"
msgstr ""
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:288
#, fuzzy
msgid "Avatars"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Avatar"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
#, fuzzy
msgid "Avatar path"
msgstr "Avatar güncellendi."
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
#, fuzzy
msgid "Avatar directory"
msgstr "Avatar güncellendi."
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr ""
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
msgstr ""
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr ""
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Sunucu"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
#, fuzzy
msgid "Sometimes"
msgstr "Durum mesajları"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr ""
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr ""
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "Sunucu"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr ""
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
#, fuzzy
msgid "Save paths"
msgstr "Yeni durum mesajı"
@@ -3749,7 +3891,7 @@ msgstr "Organizasyon"
msgid "Description"
msgstr "Tanım"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "İstatistikler"
@@ -3877,52 +4019,51 @@ msgstr "Not"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Diğerisimler"
#: actions/showgroup.php:302
msgid "Group actions"
msgstr ""
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, fuzzy, php-format
msgid "FOAF for %s group"
msgstr "%s için durum RSS beslemesi"
-#: actions/showgroup.php:393 actions/showgroup.php:445
-#, fuzzy
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
-msgstr "Üyelik başlangıcı"
+msgstr "Üyeler"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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 ""
+msgstr "(Yok)"
-#: actions/showgroup.php:404
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Tüm üyeler"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Oluşturuldu"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3932,7 +4073,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3941,7 +4082,7 @@ msgid ""
"their life and interests. "
msgstr ""
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Yöneticiler"
@@ -4875,7 +5016,7 @@ msgid "Plugins"
msgstr "Eklentiler"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Sürüm"
@@ -5111,7 +5252,7 @@ msgid "Unable to save tag."
msgstr "Etiket kaydedilemedi."
#. 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 ""
@@ -5233,54 +5374,54 @@ msgid "Untitled page"
msgstr "Başlıksız sayfa"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr ""
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Kişisel"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Servislere bağlan"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:467
+#: lib/action.php:495
msgid "Connect"
msgstr "Bağlan"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Site yapılandırmasını değiştir"
#. 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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Yönetim"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
@@ -5289,135 +5430,135 @@ msgstr ""
"edin"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Davet et"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Çıkış"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Bir hesap oluştur"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Kayıt"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Siteye giriş"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Giriş"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Bana yardım et!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Yardım"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Kişi ya da yazılar için arama yap"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Ara"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr ""
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Yardım"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Hakkında"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "SSS"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr ""
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Gizlilik"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Kaynak"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "İletişim"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr ""
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet yazılım lisansı"
@@ -5425,7 +5566,7 @@ msgstr "StatusNet yazılım lisansı"
#. 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:844
+#: lib/action.php:872
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5435,7 +5576,7 @@ msgstr ""
"hazırlanan anında mesajlaşma ağıdır. "
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -5444,7 +5585,7 @@ msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5456,50 +5597,50 @@ msgstr ""
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
msgid "Site content license"
msgstr "Site içeriği lisansı"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:877
+#: lib/action.php:905
#, 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:884
+#: lib/action.php:912
#, 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:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, 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:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
msgid "After"
msgstr "Sonra"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Önce"
@@ -5641,12 +5782,12 @@ msgid "Could not authenticate you."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr ""
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr ""
@@ -5734,11 +5875,6 @@ msgstr ""
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "İptal et"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5765,11 +5901,6 @@ msgstr "Geri al"
msgid "author element must contain a name element."
msgstr ""
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr ""
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6191,14 +6322,14 @@ msgstr ""
msgid "Updates by SMS"
msgstr ""
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Bağlan"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr ""
@@ -6915,24 +7046,24 @@ msgstr ""
msgid "Send a nudge to this user"
msgstr ""
-#: lib/oauthstore.php:283
+#: 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 "Yeni abonelik eklenemedi."
@@ -7302,60 +7433,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
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:1156
+#: lib/util.php:1166
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:1160
+#: lib/util.php:1170
#, 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:1163
+#: lib/util.php:1173
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:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
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:1174
+#: lib/util.php:1184
#, 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:1177
+#: lib/util.php:1187
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:1181
+#: lib/util.php:1191
#, 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:1184
+#: lib/util.php:1194
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 074354867..0256e6636 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:09+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:51:00+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -96,14 +96,15 @@ msgstr "Зберегти"
msgid "No such page."
msgstr "Немає такої сторінки."
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -203,12 +204,13 @@ msgstr "Ви з друзями"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Оновлення від %1$s та друзів на %2$s!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -235,7 +237,7 @@ msgstr "API метод не знайдено."
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -310,44 +312,62 @@ msgstr "Спроба заблокувати користувача невдал
msgid "Unblock user failed."
msgstr "Спроба розблокувати користувача невдала."
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "Прямі повідомлення від %s"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "Всі прямі повідомлення надіслані від %s"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "Пряме повідомлення до %s"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "Всі прямі повідомлення надіслані до %s"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "Повідомлення без тексту!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Надто довго. Максимальний розмір %d знаків."
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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[2] "Надто довго. Максимальний розмір %d знаків."
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "Отримувача не знайдено."
-#: 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 ""
"Не можна надіслати пряме повідомлення користувачеві, який не є вашим другом."
+#. 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 ""
+"Не надсилайте повідомлень самому собі; краще поговоріть із собою вголос."
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -529,15 +549,21 @@ msgstr "спільноти на %s"
msgid "Upload failed."
msgstr "Збій при завантаженні."
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "Токен для входу визначено як неправильний."
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "Жодного параметру oauth_token не забезпечено."
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "Невірний токен."
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -556,36 +582,22 @@ msgid "There was a problem with your session token. Try again, please."
msgstr ""
"Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "Недійсне ім’я / пароль!"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "Помилка бази даних при видаленні користувача OAuth-додатку."
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "Помилка бази даних при додаванні користувача OAuth-додатку."
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-"Токен запиту %s було авторизовано. Будь ласка, обміняйте його на токен "
-"доступу."
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "Токен запиту %s було скасовано і відхилено."
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -594,15 +606,15 @@ msgstr "Токен запиту %s було скасовано і відхиле
msgid "Unexpected form submission."
msgstr "Несподіване представлення форми."
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "Запит на дозвіл під’єднатися до вашого облікового запису"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "Дозволити або заборонити доступ"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -615,11 +627,11 @@ msgstr ""
"довіряєте."
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "Акаунт"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -628,23 +640,47 @@ msgid "Nickname"
msgstr "Ім’я користувача"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "Пароль"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "Відхилити"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "Скасувати"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "Дозволити"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "Дозволити або заборонити доступ до вашого облікового запису."
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "Підтвердження ІМ скасовано."
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "Токен запиту %s було скасовано і відхилено."
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "Не авторизовано."
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ."
@@ -807,7 +843,8 @@ msgid "Preview"
msgstr "Перегляд"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "Видалити"
@@ -863,12 +900,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "Ні"
@@ -881,12 +919,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "Так"
@@ -901,9 +940,12 @@ msgstr "Блокувати користувача"
msgid "Failed to save block information."
msgstr "Збереження інформації про блокування завершилось невдачею."
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1029,7 +1071,7 @@ msgstr "Ви не є власником цього додатку."
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1057,6 +1099,67 @@ msgstr "Не видаляти додаток"
msgid "Delete this application"
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 "Ви повинні спочатку увійти на сайт, аби залишити спільноту."
+
+#. 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 "Немає імені або ІД."
+
+#. 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 "Ви не стоїте у цій спільноті."
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s залишив спільноту %2$s"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "Видалити користувача"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "Не видаляти цей допис"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "Видалити цього користувача"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1131,53 +1234,63 @@ msgstr "Дизайн"
msgid "Design settings for this StatusNet site"
msgstr "Налаштування дизайну для цього сайту StatusNet"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "Помилкова URL-адреса логотипу."
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Помилкова URL-адреса логотипу."
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "Тема недоступна: %s."
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "Змінити логотип"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "Логотип сайту"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "Логотип сайту"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "Змінити тему"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "Тема сайту"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "Тема для цього сайту."
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "Своя тема"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Ви можете завантажити свою тему для сайту StatusNet як .ZIP архів."
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "Змінити фонове зображення"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1187,66 +1300,66 @@ msgstr ""
"%1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "Увімк."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "Вимк."
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Увімкнути або вимкнути фонове зображення."
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Замостити фон"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "Змінити кольори"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "Зміст"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Сайдбар"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "Посилання"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "Додатково"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "Свій CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "За замовч."
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Оновити налаштування за замовчуванням"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Повернутись до початкових налаштувань"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1256,7 +1369,7 @@ msgstr "Повернутись до початкових налаштувань"
msgid "Save"
msgstr "Зберегти"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "Зберегти дизайн"
@@ -1729,7 +1842,7 @@ msgstr "Не вдалося перетворити токени запиту н
msgid "Remote service uses unknown version of OMB protocol."
msgstr "Невідома версія протоколу OMB."
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "Помилка при оновленні віддаленого профілю."
@@ -2329,10 +2442,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Ви повинні спочатку увійти на сайт, аби долучитися до спільноти."
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Немає імені або ІД."
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2582,6 +2691,11 @@ msgstr "Ви не можете надіслати повідомлення ць
msgid "No content!"
msgstr "Немає змісту!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Надто довго. Максимальний розмір %d знаків."
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "Жодного отримувача не визначено."
@@ -2742,7 +2856,7 @@ msgstr "URL-адреса %s лише в простому HTTP, будь ласк
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримується."
@@ -2892,147 +3006,166 @@ msgstr "Шлях"
msgid "Path and server settings for this StatusNet site"
msgstr "Параметри серверу та шляху для даного сайту StatusNet"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "Директорію теми не можна прочитати: %s."
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "Директорія аватарів не доступна для запису: %s."
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "Директорія фонових зображень не доступна для запису:% s."
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "Не можна прочитати директорію локалі: %s."
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "Помилковий SSL-сервер. Максимальна довжина 255 знаків."
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "Сайт"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "Сервер"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "Ім’я хосту сервера на якому знаходиться сайт."
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "Шлях"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "Шлях до сайту"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "Шлях до локалей"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "Директорія теми"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "Директорія шляху до локалей"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "Надзвичайні URL-адреси"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "Тема"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "Сервер теми"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "Тема для цього сайту."
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "Шлях до теми"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL-сервер"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "Шлях до сайту"
+
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "Директорія теми"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "Директорія шляху до локалей"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "Аватари"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "Сервер аватари"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "Шлях до аватари"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "Директорія аватари"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "Фони"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "Сервер фонів"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "Шлях до фонів"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "Директорія фонів"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "Вкладення"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL-шифрування"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "Ніколи"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "Іноді"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "Завжди"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "Використовувати SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "Тоді використовувати SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL-сервер"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "Сервер на який направляти SSL-запити"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "Зберегти шляхи"
@@ -3797,7 +3930,7 @@ msgstr "Організація"
msgid "Description"
msgstr "Опис"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "Статистика"
@@ -3940,45 +4073,45 @@ msgstr "Додаткові імена"
msgid "Group actions"
msgstr "Дії спільноти"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "Стрічка дописів спільноти %s (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "Стрічка дописів спільноти %s (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "Стрічка дописів спільноти %s (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "FOAF спільноти %s"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "Учасники"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "Всі учасники"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "Створено"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3994,7 +4127,7 @@ msgstr ""
"register%%%%) зараз і долучіться до спілкування! ([Дізнатися більше](%%%%doc."
"help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4007,7 +4140,7 @@ msgstr ""
"програмному забезпеченні [StatusNet](http://status.net/). Учасники цієї "
"спільноти роблять короткі дописи про своє життя та інтереси. "
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "Адміни"
@@ -4964,7 +5097,7 @@ msgid "Plugins"
msgstr "Додатки"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "Версія"
@@ -5199,7 +5332,7 @@ msgid "Unable to save tag."
msgstr "Не вдається зберегти теґ."
#. 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 "Вас позбавлено можливості підписатись."
@@ -5319,185 +5452,185 @@ msgid "Untitled page"
msgstr "Сторінка без заголовку"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "Відправна навігація по сайту"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "Особисте"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адресу, аватару, пароль, профіль"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "З’єднання"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "Адмін"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Запросіть друзів та колег приєднатись до вас на %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "Запросити"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Вийти з сайту"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "Вийти"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Створити новий акаунт"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "Реєстрація"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "Увійти"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "Довідка"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "Пошук"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "Об’яви на сайті"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "Огляд"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "Зауваження сторінки"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "Допомога"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "Про"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "ЧаП"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "Умови"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "Приватність"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "Джерело"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "Контакт"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "Бедж"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "Ліцензія програмного забезпечення StatusNet"
@@ -5505,7 +5638,7 @@ msgstr "Ліцензія програмного забезпечення StatusN
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5515,7 +5648,7 @@ msgstr ""
"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -5524,7 +5657,7 @@ msgstr "**%%site.name%%** — це сервіс мікроблоґів."
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5536,51 +5669,51 @@ msgstr ""
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Зміст і дані %1$s є приватними і конфіденційними."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "Нумерація сторінок"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "Назад"
@@ -5723,12 +5856,12 @@ msgid "Could not authenticate you."
msgstr "Не вдалося автентифікувати вас."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "Спроба скасувати невідомий токен."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "Не вдалося видалити скасований токен."
@@ -5813,11 +5946,6 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "Скасувати"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5844,11 +5972,6 @@ msgstr "Відкликати"
msgid "author element must contain a name element."
msgstr "авторський елемент повинен містити назву елемента."
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "Вкладення"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6313,14 +6436,14 @@ msgstr "СМС"
msgid "Updates by SMS"
msgstr "Оновлення через СМС"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "З’єднання"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "Авторизовані під’єднані додатки"
@@ -7121,24 +7244,24 @@ msgstr "«Розштовхати»"
msgid "Send a nudge to this user"
msgstr "Спробувати «розштовхати» цього користувача"
-#: lib/oauthstore.php:283
+#: 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 "Не вдалося додати нову підписку."
@@ -7495,17 +7618,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7514,12 +7637,12 @@ msgstr[1] "близько %d хвилин тому"
msgstr[2] "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7528,12 +7651,12 @@ msgstr[1] "близько %d годин тому"
msgstr[2] "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7542,12 +7665,12 @@ msgstr[1] "близько %d днів тому"
msgstr[2] "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "місяць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7556,7 +7679,7 @@ msgstr[1] "близько %d місяців тому"
msgstr[2] "близько %d місяців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "близько року тому"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index a9600d1bb..3056f4f62 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-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:10+0000\n"
+"POT-Creation-Date: 2010-10-18 20:49+0000\n"
+"PO-Revision-Date: 2010-10-18 20:51:01+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 (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r74965); 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-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 20:28:37+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -96,14 +96,15 @@ msgstr "保存"
msgid "No such page."
msgstr "没有这个页面。"
+#. TRANS: Client error given when a user was not found (404).
#. 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/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 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
@@ -201,12 +202,13 @@ msgstr "你和好友们"
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s上%1$s和好友们的更新!"
+#. TRANS: Client error given when an API method was not found (404).
#: 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/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
@@ -233,7 +235,7 @@ msgstr "API方法没有找到。"
#: 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/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
@@ -306,43 +308,58 @@ msgstr "屏蔽用户失败。"
msgid "Unblock user failed."
msgstr "取消屏蔽用户失败。"
-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91
#, php-format
msgid "Direct messages from %s"
msgstr "%s发来的私信"
-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96
#, php-format
msgid "All the direct messages sent from %s"
msgstr "所有来自%s的私信"
-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105
#, php-format
msgid "Direct messages to %s"
msgstr "发给%s的私信"
-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110
#, php-format
msgid "All the direct messages sent to %s"
msgstr "所有发给%s的私信"
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117
msgid "No message text!"
msgstr "消息没有正文!"
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "太长了。最长的信息长度是%d个字符。"
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, 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个字符。"
+#. TRANS: Client error displayed if a recipient user could not be found (403).
#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "未找到收件人。"
-#: 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 "不能给未成为好友的用户发送私信。"
+#. 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 "不要向自己发送消息;跟自己悄悄说就得了。"
+
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
@@ -522,15 +539,21 @@ msgstr "在%s上的小组"
msgid "Upload failed."
msgstr "上传失败"
-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "指定的登录 token 无效。"
+
+#: actions/apioauthauthorize.php:109
msgid "No oauth_token parameter provided."
msgstr "没有提供 oauth_token 参数"
-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."
msgstr "无效的 token。"
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
#: actions/deletenotice.php:172 actions/disfavor.php:74
#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
@@ -548,34 +571,22 @@ msgstr "无效的 token。"
msgid "There was a problem with your session token. Try again, please."
msgstr "你的 session 出现了一个问题,请重试。"
-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163
msgid "Invalid nickname / password!"
msgstr "用户名或密码不正确。"
-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193
msgid "Database error deleting OAuth application user."
msgstr "删除 OAuth 应用用户时数据库出错。"
-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218
msgid "Database error inserting OAuth application user."
msgstr "插入 OAuth 应用用户时数据库出错。"
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "Request token 已被批准。请为它换一个 access token。"
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "%s的 request token 被拒绝并被取消。"
-
#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
#. TRANS: Message given submitting a form with an unknown action in IM settings.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 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
@@ -584,15 +595,15 @@ msgstr "%s的 request token 被拒绝并被取消。"
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291
msgid "An application would like to connect to your account"
msgstr "一个应用想连接到你的账号"
-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308
msgid "Allow or deny access"
msgstr "允许或阻止访问"
-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324
#, php-format
msgid ""
"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -603,11 +614,11 @@ msgstr ""
"strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:342 lib/action.php:490
msgid "Account"
msgstr "帐号"
-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
@@ -616,23 +627,47 @@ msgid "Nickname"
msgstr "昵称"
#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/apioauthauthorize.php:348 actions/login.php:255
#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "密码"
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "阻止"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "取消"
-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366
msgid "Allow"
msgstr "允许"
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
msgstr "允许或阻止对你账户信息的访问。"
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM 确认已取消。"
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "%s的 request token 被拒绝并被取消。"
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "你没有被授权。"
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+
#: actions/apistatusesdestroy.php:112
msgid "This method requires a POST or DELETE."
msgstr "此方法接受POST或DELETE请求。"
@@ -793,7 +828,8 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667
msgid "Delete"
msgstr "删除"
@@ -848,12 +884,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178
msgctxt "BUTTON"
msgid "No"
msgstr "否"
@@ -866,12 +903,13 @@ 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:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
msgstr "是"
@@ -886,9 +924,12 @@ msgstr "屏蔽这个用户"
msgid "Failed to save block information."
msgstr "保存屏蔽信息失败。"
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
#. 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/deletegroup.php:87 actions/deletegroup.php:100
#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
@@ -1014,7 +1055,7 @@ msgstr "你不是该应用的拥有者。"
#. 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:1307
+#: lib/action.php:1353
msgid "There was a problem with your session token."
msgstr "你的 session token 出现了问题。"
@@ -1041,6 +1082,66 @@ msgstr "不删除该应用"
msgid "Delete this application"
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 "你必须登录才能离开小组。"
+
+#. 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 "没有昵称或 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 "你不是该小组成员。"
+
+#. 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
+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
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s离开了%2$s小组。"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "删除用户"
+
+#: 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
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "不要删除这个消息"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "删除这个用户"
+
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1114,53 +1215,63 @@ msgstr "外观"
msgid "Design settings for this StatusNet site"
msgstr "这个 StatusNet 网站的外观设置"
-#: actions/designadminpanel.php:331
+#: actions/designadminpanel.php:332
msgid "Invalid logo URL."
msgstr "无效的 logo URL。"
-#: actions/designadminpanel.php:335
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "无效的 logo URL。"
+
+#: actions/designadminpanel.php:341
#, php-format
msgid "Theme not available: %s."
msgstr "主题不可用:%s。"
-#: actions/designadminpanel.php:439
+#: actions/designadminpanel.php:445
msgid "Change logo"
msgstr "更换 logo"
-#: actions/designadminpanel.php:444
+#: actions/designadminpanel.php:450
msgid "Site logo"
msgstr "网站 logo"
-#: actions/designadminpanel.php:456
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "网站 logo"
+
+#: actions/designadminpanel.php:466
msgid "Change theme"
msgstr "更换主题"
-#: actions/designadminpanel.php:473
+#: actions/designadminpanel.php:483
msgid "Site theme"
msgstr "网站主题"
-#: actions/designadminpanel.php:474
+#: actions/designadminpanel.php:484
msgid "Theme for the site."
msgstr "这个网站的主题。"
-#: actions/designadminpanel.php:480
+#: actions/designadminpanel.php:490
msgid "Custom theme"
msgstr "自定义主题"
-#: actions/designadminpanel.php:484
+#: actions/designadminpanel.php:494
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
-#: actions/designadminpanel.php:499 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101
msgid "Change background image"
msgstr "更换背景图像"
-#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597
#: lib/designsettings.php:178
msgid "Background"
msgstr "背景"
-#: actions/designadminpanel.php:509
+#: actions/designadminpanel.php:519
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1168,66 +1279,66 @@ msgid ""
msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:540 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139
msgid "On"
msgstr "打开"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155
msgid "Off"
msgstr "关闭"
-#: actions/designadminpanel.php:558 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "打开或关闭背景图片"
-#: actions/designadminpanel.php:563 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161
msgid "Tile background image"
msgstr "平铺背景图片"
-#: actions/designadminpanel.php:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170
msgid "Change colours"
msgstr "改变颜色"
-#: actions/designadminpanel.php:600 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:613 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204
msgid "Sidebar"
msgstr "边栏"
-#: actions/designadminpanel.php:626 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217
msgid "Text"
msgstr "文字"
-#: actions/designadminpanel.php:639 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230
msgid "Links"
msgstr "链接"
-#: actions/designadminpanel.php:664
+#: actions/designadminpanel.php:674
msgid "Advanced"
msgstr "高级"
-#: actions/designadminpanel.php:668
+#: actions/designadminpanel.php:678
msgid "Custom CSS"
msgstr "自定义CSS"
-#: actions/designadminpanel.php:689 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247
msgid "Use defaults"
msgstr "使用默认值"
-#: actions/designadminpanel.php:690 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "恢复默认外观"
-#: actions/designadminpanel.php:696 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "重置到默认"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
@@ -1237,7 +1348,7 @@ msgstr "重置到默认"
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:699 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257
msgid "Save design"
msgstr "保存外观"
@@ -1703,7 +1814,7 @@ msgstr "无法将 request token 转换为 access token。"
msgid "Remote service uses unknown version of OMB protocol."
msgstr "远程服务使用了未知版本的 OMB 协议。"
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "更新远程的个人信息时出错。"
@@ -2276,10 +2387,6 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "你必须登录才能加入小组。"
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "没有昵称或 ID。"
-
#: actions/joingroup.php:141
#, php-format
msgid "%1$s joined group %2$s"
@@ -2518,6 +2625,11 @@ msgstr "无法向此用户发送消息。"
msgid "No content!"
msgstr "没有内容!"
+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "太长了。最长的信息长度是%d个字符。"
+
#: actions/newmessage.php:158
msgid "No recipient specified."
msgstr "没有收件人。"
@@ -2675,7 +2787,7 @@ msgstr "请只用HTTP明文的%sURLs的地址。"
#. TRANS: Client error on an API request with an unsupported data format.
#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -2823,147 +2935,166 @@ msgstr "路径"
msgid "Path and server settings for this StatusNet site"
msgstr "这个 StatusNet 网站的路径和服务器设置。"
-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158
#, php-format
msgid "Theme directory not readable: %s."
msgstr "主题目录无法读取:%s。"
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164
#, php-format
msgid "Avatar directory not writable: %s."
msgstr "头像目录无法写入:%s。"
-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170
#, php-format
msgid "Background directory not writable: %s."
msgstr "背景目录无法写入:%s。"
-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178
#, php-format
msgid "Locales directory not readable: %s."
msgstr "本地化目录无法读取:%s。"
-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184
msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr "无效的 SSL 服务器。最大长度255个字符。"
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
msgid "Site"
msgstr "网站"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343
msgid "Server"
msgstr "服务器"
-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239
msgid "Site's server hostname."
msgstr "网站的服务器主机名。"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347
msgid "Path"
msgstr "路径"
-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243
msgid "Site path"
msgstr "网站路径"
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "本地化文件路径"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "主题目录"
-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247
msgid "Directory path to locales"
msgstr "本地化文件的目录路径"
-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251
msgid "Fancy URLs"
msgstr "优化 URLs"
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253
msgid "Use fancy (more readable and memorable) URLs?"
msgstr "使用优化的 URLs(更简洁易记)?"
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260
msgid "Theme"
msgstr "主题"
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "主题服务器"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "这个网站的主题。"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL 服务器"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "主题路径"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "网站路径"
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"
msgstr "主题目录"
-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "本地化文件的目录路径"
+
+#: actions/pathsadminpanel.php:288
msgid "Avatars"
msgstr "头像"
-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293
msgid "Avatar server"
msgstr "头像服务器"
-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297
msgid "Avatar path"
msgstr "头像路径"
-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301
msgid "Avatar directory"
msgstr "头像目录"
-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310
msgid "Backgrounds"
msgstr "背景"
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "背景服务器"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "背景图路径"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "背景图目录"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "附件"
-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366
msgid "SSL"
msgstr "SSL"
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202
msgid "Never"
msgstr "从不"
-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371
msgid "Sometimes"
msgstr "有时"
-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372
msgid "Always"
msgstr "总是"
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374
msgid "Use SSL"
msgstr "使用 SSL"
-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375
msgid "When to use SSL"
msgstr "什么时候使用 SSL"
-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL 服务器"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381
msgid "Server to direct SSL requests to"
msgstr "直接SSL请求访问的服务器"
-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397
msgid "Save paths"
msgstr "保存路径"
@@ -3698,7 +3829,7 @@ msgstr "组织名称必填。"
msgid "Description"
msgstr "描述"
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442
#: lib/profileaction.php:187
msgid "Statistics"
msgstr "统计"
@@ -3835,45 +3966,45 @@ msgstr "别名"
msgid "Group actions"
msgstr "小组动作"
-#: actions/showgroup.php:338
+#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s小组的消息聚合 (RSS 1.0)"
-#: actions/showgroup.php:344
+#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s小组的消息聚合 (RSS 2.0)"
-#: actions/showgroup.php:350
+#: actions/showgroup.php:356
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s小组的消息聚合 (Atom)"
-#: actions/showgroup.php:355
+#: actions/showgroup.php:361
#, php-format
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#: actions/showgroup.php:399 actions/showgroup.php:451
msgid "Members"
msgstr "小组成员"
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 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
+#: actions/showgroup.php:410
msgid "All members"
msgstr "所有成员"
-#: actions/showgroup.php:439
+#: actions/showgroup.php:445
msgid "Created"
msgstr "建立"
-#: actions/showgroup.php:455
+#: actions/showgroup.php:461
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3888,7 +4019,7 @@ msgstr ""
"入](%%%%action.register%%%%)成为该小组的一员并享受更多的欢乐!([阅读更多](%%"
"%%doc.help%%%%))"
-#: actions/showgroup.php:461
+#: actions/showgroup.php:467
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3901,7 +4032,7 @@ msgstr ""
"E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和各种兴"
"趣的消息。"
-#: actions/showgroup.php:489
+#: actions/showgroup.php:495
msgid "Admins"
msgstr "管理员"
@@ -4820,7 +4951,7 @@ msgid "Plugins"
msgstr "插件"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830
msgid "Version"
msgstr "版本"
@@ -5049,7 +5180,7 @@ msgid "Unable to save tag."
msgstr "无法保存标签。"
#. 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 "你被禁止添加关注。"
@@ -5169,185 +5300,185 @@ msgid "Untitled page"
msgstr "无标题页"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:448
+#: lib/action.php:476
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:454
+#: lib/action.php:482
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:457
+#: lib/action.php:485
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:459
+#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改你的 email 地址、头像、密码、资料"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:464
+#: lib/action.php:492
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:467
+#: lib/action.php:495
msgid "Connect"
msgstr "关联"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:470
+#: lib/action.php:498
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:473 lib/groupnav.php:117
+#: lib/action.php:501 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "管理"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:477
+#: lib/action.php:505
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "邀请好友和同事加入%s。"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:480
+#: lib/action.php:508
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:486
+#: lib/action.php:514
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "从网站登出"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:489
+#: lib/action.php:517
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:494
+#: lib/action.php:522
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建一个账户"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:497
+#: lib/action.php:525
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:500
+#: lib/action.php:528
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登录这个网站"
-#: lib/action.php:503
+#: lib/action.php:531
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:506
+#: lib/action.php:534
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助我!"
-#: lib/action.php:509
+#: lib/action.php:537
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:512
+#: lib/action.php:540
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "搜索人或文字"
-#: lib/action.php:515
+#: lib/action.php:543
msgctxt "MENU"
msgid "Search"
msgstr "搜索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:537 lib/adminpanelaction.php:387
+#: lib/action.php:565 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "网站消息"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:604
+#: lib/action.php:632
msgid "Local views"
msgstr "本地显示"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:674
+#: lib/action.php:702
msgid "Page notice"
msgstr "页面消息"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:775
+#: lib/action.php:803
msgid "Secondary site navigation"
msgstr "副站导航"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:781
+#: lib/action.php:809
msgid "Help"
msgstr "帮助"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:784
+#: lib/action.php:812
msgid "About"
msgstr "关于"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:787
+#: lib/action.php:815
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:792
+#: lib/action.php:820
msgid "TOS"
msgstr "条款"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:796
+#: lib/action.php:824
msgid "Privacy"
msgstr "隐私"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:799
+#: lib/action.php:827
msgid "Source"
msgstr "源码"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:805
+#: lib/action.php:833
msgid "Contact"
msgstr "联系"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:808
+#: lib/action.php:836
msgid "Badge"
msgstr "挂件"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:837
+#: lib/action.php:865
msgid "StatusNet software license"
msgstr "StatusNet 软件许可证"
@@ -5355,7 +5486,7 @@ msgstr "StatusNet 软件许可证"
#. 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:844
+#: lib/action.php:872
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5365,7 +5496,7 @@ msgstr ""
"broughtbyurl%%)。"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:847
+#: lib/action.php:875
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -5374,7 +5505,7 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
#. 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:854
+#: lib/action.php:882
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5385,50 +5516,50 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:870
+#: lib/action.php:898
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:877
+#: lib/action.php:905
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$s的内容和数据是私人且保密的。"
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:884
+#: lib/action.php:912
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "内容和数据%1$s版权所有并保留所有权利。"
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:888
+#: lib/action.php:916
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:902
+#: lib/action.php:948
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1238
+#: lib/action.php:1284
msgid "Pagination"
msgstr "分页"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1249
+#: lib/action.php:1295
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:1259
+#: lib/action.php:1305
msgid "Before"
msgstr "之前"
@@ -5568,12 +5699,12 @@ msgid "Could not authenticate you."
msgstr "无法验证你。"
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:184
msgid "Tried to revoke unknown token."
msgstr "尝试了取消未知的 token。"
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:189
msgid "Failed to delete revoked token."
msgstr "删除取消的 token 失败。"
@@ -5655,11 +5786,6 @@ msgstr "读写"
msgid "Default access for this application: read-only, or read-write"
msgstr "该应用默认的访问权限:只读或读写"
-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "取消"
-
#. TRANS: Application access type
#: lib/applicationlist.php:134
msgid "read-write"
@@ -5686,11 +5812,6 @@ msgstr "取消"
msgid "author element must contain a name element."
msgstr "作者元素必须包含一个名称元素。"
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "附件"
-
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:256
msgid "Author"
@@ -6141,13 +6262,13 @@ msgstr "SMS"
msgid "Updates by SMS"
msgstr "使用 SMS 更新"
-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
msgctxt "MENU"
msgid "Connections"
msgstr "关联"
-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "被授权已连接的应用"
@@ -6932,24 +7053,24 @@ msgstr "呼叫"
msgid "Send a nudge to this user"
msgstr "呼叫这个用户"
-#: lib/oauthstore.php:283
+#: 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 "无法添加新的关注。"
@@ -7301,60 +7422,60 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1153
+#: lib/util.php:1163
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1156
+#: lib/util.php:1166
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1160
+#: lib/util.php:1170
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1163
+#: lib/util.php:1173
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1167
+#: lib/util.php:1177
#, 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:1170
+#: lib/util.php:1180
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1174
+#: lib/util.php:1184
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1177
+#: lib/util.php:1187
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1181
+#: lib/util.php:1191
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1184
+#: lib/util.php:1194
msgid "about a year ago"
msgstr "约1年前"
@@ -7371,7 +7492,7 @@ msgstr "%s不是有效的颜色!应使用3或6个十六进制字符。"
#: scripts/restoreuser.php:82
#, php-format
msgid "Backup file for user %s (%s)"
-msgstr "用户 %s (%s) 的备份文件\n"
+msgstr "用户 %s (%s) 的备份文件"
#: scripts/restoreuser.php:88
msgid "No user specified; using backup user."