summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po332
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po361
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po347
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po341
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po367
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po373
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po373
-rw-r--r--locale/da/LC_MESSAGES/statusnet.po352
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po373
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po363
-rw-r--r--locale/eo/LC_MESSAGES/statusnet.po1032
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po612
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po371
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po322
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po449
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po302
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po406
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po351
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po383
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po314
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po371
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po365
-rw-r--r--locale/ka/LC_MESSAGES/statusnet.po373
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po357
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po398
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po368
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po381
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po318
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po437
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po377
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po431
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po415
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po427
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po379
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po1157
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po412
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po387
37 files changed, 11203 insertions, 4274 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 982de63dd..0c745cd0c 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:13+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:11+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ msgstr "Stoor toegangsinstellings"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Stoor"
@@ -643,7 +643,7 @@ msgstr "Nie gevind nie."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Nie-ondersteunde formaat."
@@ -800,9 +800,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blokkeer hierdie gebruiker"
@@ -911,7 +910,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -1005,52 +1004,52 @@ msgid "Design"
msgstr "Ontwerp"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Die logo-URL is ongeldig."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "IM is nie beskikbaar nie."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Verander logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Webwerf-logo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Verander tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Werf se tema"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema vir die werf."
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Verander die agtergrond-prent"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Agtergrond"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1058,63 +1057,64 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Af"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Verander kleure"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Kantstrook"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Skakels"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Gevorderd"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Gebruik verstekwaardes"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Stel terug na standaard"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Stoor"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Stoor ontwerp"
@@ -1192,7 +1192,7 @@ msgstr "Die \"callback\" is te lank."
msgid "Callback URL is not valid."
msgstr "Die \"callback\"-URL is nie geldig nie."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Dit was nie moontlik om die applikasie by te werk nie."
@@ -1283,7 +1283,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Kanselleer"
@@ -1625,6 +1625,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -1972,6 +1978,110 @@ msgstr "U is nie 'n lid van daardie groep nie."
msgid "%1$s left group %2$s"
msgstr "%1$s het die groep %2$s verlaat"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U is reeds aangeteken."
@@ -2132,7 +2242,7 @@ msgid "Applications you have registered"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -2148,7 +2258,7 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
@@ -2264,7 +2374,7 @@ msgid "Paths"
msgstr "Paaie"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:157
@@ -2839,7 +2949,7 @@ msgid "Sessions"
msgstr "Sessies"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:177
@@ -3433,54 +3543,58 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Gebruiker"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiel"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Profiellimiet"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nuwe gebruikers"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Uitnodigings"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:110
msgid ""
"Please check these details to make sure that you want to subscribe to this "
@@ -3488,7 +3602,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Lisensie"
@@ -3635,6 +3751,11 @@ msgstr "Weergawe"
msgid "Author(s)"
msgstr "Outeur(s)"
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3674,6 +3795,17 @@ msgstr ""
msgid "Not part of group."
msgstr "Nie lid van die groep nie."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Aansluit"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3722,18 +3854,18 @@ msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3767,9 +3899,18 @@ msgstr ""
msgid "Not subscribed!"
msgstr ""
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom by %1$s, @%2$s!"
@@ -4032,13 +4173,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Voor"
@@ -4090,6 +4231,11 @@ msgstr "Ontwerp"
msgid "User"
msgstr "Gebruiker"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4143,37 +4289,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Webblaaier"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Lees-alleen"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lees-skryf"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Kanselleer"
@@ -4556,8 +4702,8 @@ msgid "FOAF"
msgstr "Vriende van vriende (FOAF)"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Eksporteer data"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4723,10 +4869,6 @@ msgstr "kB"
msgid "[%s]"
msgstr "[%s]"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Aansluit"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Verlaat"
@@ -5212,7 +5354,7 @@ msgstr "Gewild"
msgid "Yes"
msgstr "Ja"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5382,17 +5524,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5400,12 +5542,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5413,12 +5555,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5426,12 +5568,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5439,7 +5581,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
@@ -5453,3 +5595,17 @@ msgstr "%s is nie 'n geldige kleur nie!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 5ab941eab..19a7da540 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:19+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:12+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ msgstr "حفظ إعدادت الوصول"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "احفظ"
@@ -576,7 +576,7 @@ msgstr "لم يوجد."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
@@ -740,9 +740,8 @@ msgid "Yes"
msgstr "نعم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "امنع هذا المستخدم"
@@ -864,7 +863,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -957,53 +956,57 @@ msgstr "احذف هذا المستخدم"
msgid "Design"
msgstr "التصميم"
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:74
+msgid "Design settings for this StatusNet site"
+msgstr ""
+
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "السمة غير متوفرة: %s"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "سمة الموقع"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "سمة الموقع."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "سمة مخصصة"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صورة الخلفية"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1011,71 +1014,72 @@ msgid ""
msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صورة الخلفية أو عطّلها."
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "متقدم"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS مخصصة"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -1141,7 +1145,7 @@ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
msgid "Organization homepage is required."
msgstr "صفحة المنظمة الرئيسية مطلوبة."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "لم يمكن تحديث التطبيق."
@@ -1227,7 +1231,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "ألغِ"
@@ -1639,6 +1643,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "اجعل المستخدم إداريًا في المجموعة"
@@ -1987,6 +1997,110 @@ msgstr "لست عضوا في تلك المجموعة."
msgid "%1$s left group %2$s"
msgstr "%1$s ترك المجموعة %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالفعل."
@@ -2186,7 +2300,7 @@ msgid "Applications you have registered"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:175
@@ -2206,7 +2320,7 @@ msgstr ""
msgid "Developers can edit the registration settings for their applications "
msgstr ""
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "حالة %1$s في يوم %2$s"
@@ -2359,6 +2473,10 @@ msgstr "حُفظت كلمة السر."
msgid "Paths"
msgstr "المسارات"
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -3094,8 +3212,8 @@ msgid "Sessions"
msgstr "الجلسات"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "إعدادات جلسة موقع StatusNet هذا."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
@@ -3110,7 +3228,6 @@ msgid "Turn on debugging output for sessions."
msgstr "مكّن تنقيح مُخرجات الجلسة."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "اذف إعدادت الموقع"
@@ -3846,70 +3963,78 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "المستخدم"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "الملف الشخصي"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "حد السيرة"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "مستخدمون جدد"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "ترحيب المستخدمين الجدد"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "الاشتراك المبدئي"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "الدعوات"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "الدعوات مُفعلة"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:110
msgid ""
"Please check these details to make sure that you want to subscribe to this "
@@ -3917,7 +4042,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "الرخصة"
@@ -4078,6 +4205,15 @@ msgstr "النسخة"
msgid "Author(s)"
msgstr "المؤلف(ون)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "فضّل"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4127,6 +4263,17 @@ msgstr "ليس جزءا من المجموعة."
msgid "Group leave failed."
msgstr "ترك المجموعة فشل."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "انضم"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4197,13 +4344,13 @@ msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -4257,9 +4404,18 @@ msgstr "تعذّر حفظ الاشتراك."
msgid "Could not delete subscription."
msgstr "تعذّر حفظ الاشتراك."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
@@ -4556,13 +4712,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "قبل"
@@ -4655,6 +4811,11 @@ msgstr "ضبط الجلسات"
msgid "Edit site notice"
msgstr "عدّل إشعار الموقع"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4722,37 +4883,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "متصفح"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "ألغِ"
@@ -5187,10 +5348,6 @@ msgstr "ألغِ تفضيل هذا الإشعار"
msgid "Favor this notice"
msgstr "فضّل هذا الإشعار"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "فضّل"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "آرإس​إس 1.0"
@@ -5208,8 +5365,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "تصدير البيانات"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5375,10 +5532,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "مصدر صندوق وارد غير معروف %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "انضم"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "غادر"
@@ -5962,7 +6115,7 @@ msgstr "نعم"
msgid "Repeat this notice"
msgstr "كرّر هذا الإشعار"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6171,17 +6324,17 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6193,12 +6346,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6210,12 +6363,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6227,12 +6380,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6244,7 +6397,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
@@ -6252,3 +6405,17 @@ msgstr "قبل سنة تقريبًا"
#, php-format
msgid "%s is not a valid color!"
msgstr "%s ليس لونًا صحيحًا!"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index c4c8f4a3b..349e99b91 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:21+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:14+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -515,7 +515,7 @@ msgstr "لم يوجد."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "نسق غير مدعوم."
@@ -668,9 +668,8 @@ msgid "Do not block this user"
msgstr "لا تمنع هذا المستخدم"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "امنع هذا المستخدم"
@@ -782,7 +781,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -866,117 +865,118 @@ msgid "Design"
msgstr "التصميم"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "المراسله الفوريه غير متوفره."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "غيّر الشعار"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "شعار الموقع"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "غيّر السمة"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "سمه الموقع"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "سمه الموقع."
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغيير صوره الخلفية"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "الخلفية"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "مكّن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "عطّل"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "مكّن صوره الخلفيه أو عطّلها."
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغيير الألوان"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "المحتوى"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "الشريط الجانبي"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "النص"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "وصلات"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استخدم المبدئيات"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "استعد التصميمات المبدئية"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "ارجع إلى المبدئي"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "أرسل"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "احفظ التصميم"
@@ -1038,7 +1038,7 @@ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
msgid "Callback is too long."
msgstr ""
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "ما نفعش تحديث الapplication."
@@ -1454,6 +1454,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -1777,6 +1783,110 @@ msgstr "لست عضوا فى تلك المجموعه."
msgid "%1$s left group %2$s"
msgstr "%1$s ساب جروپ %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "والج بالفعل."
@@ -1973,7 +2083,7 @@ msgid "Applications you have registered"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:175
@@ -2133,7 +2243,7 @@ msgid "Paths"
msgstr "المسارات"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:157
@@ -2834,6 +2944,10 @@ msgstr "StatusNet"
msgid "Sessions"
msgstr "الجلسات"
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site"
+msgstr ""
+
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
msgstr ""
@@ -2847,7 +2961,6 @@ msgid "Turn on debugging output for sessions."
msgstr "مكّن تنقيح مُخرجات الجلسه."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "اذف إعدادت الموقع"
@@ -3468,69 +3581,73 @@ msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "الملف الشخصي"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "حد السيرة"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "مستخدمون جدد"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "ترحيب المستخدمين الجدد"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "الاشتراك المبدئي"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "الدعوات"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "الدعوات مُفعلة"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:110
msgid ""
"Please check these details to make sure that you want to subscribe to this "
@@ -3538,7 +3655,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "الرخصة"
@@ -3688,6 +3807,15 @@ msgstr "النسخه"
msgid "Author(s)"
msgstr "المؤلف/ين"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "فضّل"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3737,6 +3865,17 @@ msgstr "مش جزء من الجروپ."
msgid "Group leave failed."
msgstr "الخروج من الجروپ فشل."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "انضم"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when trying creating a login token failed.
#. TRANS: %s is the user nickname for which token creation failed.
#: classes/Login_token.php:78
@@ -3802,13 +3941,13 @@ msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -3828,7 +3967,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "تعذّر حفظ الوسوم."
@@ -3867,9 +4006,18 @@ msgstr "تعذّر حفظ الاشتراك."
msgid "Could not delete subscription."
msgstr "تعذّر حفظ الاشتراك."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم فى %1$s يا @%2$s!"
@@ -4082,13 +4230,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "قبل"
@@ -4148,6 +4296,11 @@ msgstr "المستخدم"
msgid "Paths configuration"
msgstr "ضبط المسارات"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4205,37 +4358,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "ألغِ"
@@ -4616,10 +4769,6 @@ msgstr "ألغِ تفضيل هذا الإشعار"
msgid "Favor this notice"
msgstr "فضّل هذا الإشعار"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "فضّل"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "آرإس​إس 1.0"
@@ -4637,8 +4786,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "تصدير البيانات"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4809,10 +4958,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "مصدر الـinbox مش معروف %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "انضم"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "غادر"
@@ -5341,7 +5486,7 @@ msgstr "نعم"
msgid "Repeat this notice"
msgstr "كرر هذا الإشعار"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5542,17 +5687,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5564,12 +5709,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5581,12 +5726,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5598,12 +5743,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5615,7 +5760,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
@@ -5623,3 +5768,17 @@ msgstr "قبل سنه تقريبًا"
#, php-format
msgid "%s is not a valid color!"
msgstr "%s ليس لونًا صحيحًا!"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index b3e0e2950..8fa328982 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:23+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:15+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ msgstr "Запазване настройките за достъп"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Запазване"
@@ -633,7 +633,7 @@ msgstr "Не е открито."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Неподдържан формат."
@@ -821,9 +821,8 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Блокиране на потребителя"
@@ -949,7 +948,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -1036,32 +1035,36 @@ msgstr ""
msgid "Delete this user"
msgstr "Изтриване на този потребител"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:74
+msgid "Design settings for this StatusNet site"
+msgstr ""
+
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Смяна на логото"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Лого на сайта"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Път до сайта"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Смяна на изображението за фон"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1071,63 +1074,64 @@ msgstr ""
"2MB."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Изкл."
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Смяна на цветовете"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Съдържание"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Страничен панел"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Лиценз"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Запазване"
@@ -1261,7 +1265,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Отказ"
@@ -1655,6 +1659,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -2044,6 +2054,110 @@ msgstr "Не членувате в тази група."
msgid "%1$s left group %2$s"
msgstr "%1$s напусна групата %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вече сте влезли."
@@ -2208,7 +2322,7 @@ msgid "Applications you have registered"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:175
@@ -2232,7 +2346,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Потребителят няма профил."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Бележка на %1$s от %2$s"
@@ -2378,8 +2492,8 @@ msgid "Paths"
msgstr "Пътища"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Пътища и сървърни настройки за тази инсталация на StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:163
#, php-format
@@ -3124,8 +3238,8 @@ msgid "Sessions"
msgstr "Сесии"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Пътища и сървърни настройки за тази инсталация на StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3144,7 +3258,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Запазване настройките на сайта"
@@ -3923,59 +4036,69 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Потребител"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Нови потребители"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Покани"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Поканите са включени"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Одобряване на абонамента"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Лиценз"
@@ -4122,6 +4245,15 @@ msgstr "Версия"
msgid "Author(s)"
msgstr "Автор(и)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Любимо"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4156,6 +4288,17 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Присъединяване"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -4209,13 +4352,13 @@ msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4235,7 +4378,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Грешка при запазване на етикетите."
@@ -4259,9 +4402,18 @@ msgstr "Грешка при добавяне на нов абонамент."
msgid "Could not delete subscription."
msgstr "Грешка при добавяне на нов абонамент."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
@@ -4527,19 +4679,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Преди"
@@ -4599,6 +4751,11 @@ msgstr "Настройка на пътищата"
msgid "Edit site notice"
msgstr "Изтриване на бележката"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4651,37 +4808,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Отказ"
@@ -5039,10 +5196,6 @@ msgstr "Отбелязване като любимо"
msgid "Favor this notice"
msgstr "Отбелязване като любимо"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Любимо"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5060,8 +5213,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Изнасяне на данните"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5249,10 +5402,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Непознат език \"%s\"."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Присъединяване"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Напускане"
@@ -5811,7 +5960,7 @@ msgstr "Да"
msgid "Repeat this notice"
msgstr "Повтаряне на тази бележка"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6009,17 +6158,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6027,12 +6176,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "преди около час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6040,12 +6189,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6053,12 +6202,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "преди около месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6066,7 +6215,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "преди около година"
@@ -6079,3 +6228,17 @@ msgstr "%s не е допустим цвят!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index cacb78fb4..ca605d1a5 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:25+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:16+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -81,7 +81,7 @@ msgstr "Enrollañ an arventennoù moned"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Enrollañ"
@@ -656,7 +656,7 @@ msgstr "N'eo ket bet kavet."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Diembreget eo ar furmad-se."
@@ -843,9 +843,8 @@ msgid "Yes"
msgstr "Ya"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Stankañ an implijer-mañ"
@@ -982,7 +981,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -1076,56 +1075,56 @@ msgid "Design"
msgstr "Design"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL fall evit al logo."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "N'eus ket eus ar gaoz-se : %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Cheñch al logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo al lec'hienn"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Lakaat un dodenn all"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Dodenn al lec'hienn"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Dodenn evit al lec'hienn."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Dodenn personelaet"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Kemmañ ar skeudenn foñs"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1133,75 +1132,76 @@ msgid ""
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Gweredekaet"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Diweredekaet"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Adober gant ar skeudenn drekleur"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kemmañ al livioù"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Endalc'h"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barenn kostez"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Testenn"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Liammoù"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Araokaet"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personelaet"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Implijout an talvoudoù dre ziouer"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Adlakaat an neuz dre ziouer."
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Adlakaat an arventennoù dre ziouer"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Enrollañ"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Enrollañ an design"
@@ -1279,7 +1279,7 @@ msgstr "Rez hir eo ar c'hounadur (Callback)."
msgid "Callback URL is not valid."
msgstr "N'eo ket mat an URL kounadur (Callback)."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Diposubl eo hizivaat ar poellad"
@@ -1370,7 +1370,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Nullañ"
@@ -1735,6 +1735,12 @@ msgstr "Merañ"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Stankañ"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1745,7 +1751,7 @@ msgstr "Lakaat an implijer da vezañ ur merour eus ar strollad"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Lakaat ur merour"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
@@ -1946,7 +1952,7 @@ msgstr "N'eo ket ho ID Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:450
msgid "The IM address was removed."
-msgstr "Ar chomlec'h IM zo bet dilamet."
+msgstr "Dilamet eo bet ar chomlec'h IM."
#: actions/inbox.php:59
#, php-format
@@ -2099,6 +2105,110 @@ msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
msgid "%1$s left group %2$s"
msgstr "%1$s en deus kuitaet ar strollad %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Kevreet oc'h dija."
@@ -2308,7 +2418,7 @@ msgid "Connected applications"
msgstr "Poeladoù kevreet."
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:175
@@ -2323,7 +2433,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "N'en deus ket an ali a profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statud %1$s war %2$s"
@@ -2450,6 +2560,10 @@ msgstr "Ger-tremen enrollet."
msgid "Paths"
msgstr "Hentoù"
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -2985,7 +3099,7 @@ msgstr "N'eo ket aotreet krouiñ kontoù."
#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
msgstr ""
-"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
+"Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
"gont."
#: actions/register.php:219
@@ -3227,8 +3341,8 @@ msgid "Sessions"
msgstr "Dalc'hoù"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Arventennoù evit al lec'hienn StatusNet-mañ."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3247,7 +3361,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Enrollañ arventennoù al lec'hienn"
@@ -3993,58 +4106,66 @@ msgid "Unsubscribed"
msgstr "Digoumanantet"
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Implijer"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Bevenn ar bio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Implijerien nevez"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Degemer an implijerien nevez"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Koumanantoù dre ziouer"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Pedadennoù"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Pedadennoù gweredekaet"
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Aotreañ ar c'houmanant"
@@ -4056,7 +4177,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Aotre implijout"
@@ -4235,6 +4358,15 @@ msgstr "Stumm"
msgid "Author(s)"
msgstr "Aozer(ien)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Pennrolloù"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4284,6 +4416,17 @@ msgstr "N'eo ezel eus strollad ebet."
msgid "Group leave failed."
msgstr "C'hwitet eo bet an disenskrivadur d'ar strollad."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Stagañ"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -4336,18 +4479,18 @@ msgid "Problem saving notice."
msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4372,7 +4515,7 @@ msgid "Missing profile."
msgstr "Mankout a ra ar profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Dibosupl eo enrollañ an tikedenn."
@@ -4411,9 +4554,18 @@ msgstr "Dibosupl eo dilemel ar c'houmanant."
msgid "Could not delete subscription."
msgstr "Dibosupl eo dilemel ar c'houmanant."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Deuet mat da %1$s, @%2$s !"
@@ -4710,19 +4862,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Kent"
@@ -4825,6 +4977,11 @@ msgstr "Kemmañ ali al lec'hienn"
msgid "Snapshots configuration"
msgstr "Kefluniadur ar primoù"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4908,37 +5065,37 @@ msgid "URL to redirect to after authentication"
msgstr "URL davet pehini e o ret adkas goude bezañ kevreet"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Merdeer"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Burev"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Seurt ar poellad, merdeer pe burev"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Lenn hepken"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lenn-skrivañ"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Nullañ"
@@ -5331,10 +5488,6 @@ msgstr "Tennañ eus ar pennrolloù"
msgid "Favor this notice"
msgstr "Ouzhpennañ d'ar pennrolloù"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Pennrolloù"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5352,7 +5505,7 @@ msgid "FOAF"
msgstr "Mignon ur mignon (FOAF)"
#: lib/feedlist.php:64
-msgid "Export data"
+msgid "Feeds"
msgstr ""
#: lib/galleryaction.php:121
@@ -5501,10 +5654,6 @@ msgstr "Ko"
msgid "[%s]"
msgstr "[%s]"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Stagañ"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Kuitaat"
@@ -6009,7 +6158,7 @@ msgstr "Ya"
msgid "Repeat this notice"
msgstr "Adkregiñ gant an ali-mañ"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6184,17 +6333,17 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6202,12 +6351,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6215,12 +6364,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6228,12 +6377,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6241,7 +6390,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
@@ -6254,3 +6403,17 @@ msgstr "n'eo ket %s ul liv reizh !"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index cf1c34775..a2f4b163d 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:26+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:17+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ msgstr "Desa els paràmetres d'accés"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Desa"
@@ -698,7 +698,7 @@ msgstr "No s'ha trobat."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "El format no està implementat."
@@ -896,9 +896,8 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloca aquest usuari"
@@ -1034,7 +1033,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
@@ -1135,56 +1134,56 @@ msgid "Design"
msgstr "Disseny"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "L'URL del logotip no és vàlid."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Canvia el logotip"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotip del lloc"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Canvia el tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema del lloc"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema del lloc."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Tema personalitzat"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Canvia la imatge de fons"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fons"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1193,75 +1192,76 @@ 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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Activada"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivada"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activa o desactiva la imatge de fons."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Posa en mosaic la imatge de fons"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Canvia els colors"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contingut"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Enllaços"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avançat"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalitzat"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilitza els paràmetres per defecte"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaura els dissenys per defecte"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Torna a restaurar al valor per defecte"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Desa"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Desa el disseny"
@@ -1339,7 +1339,7 @@ msgstr "La crida de retorn és massa llarga."
msgid "Callback URL is not valid."
msgstr "L'URL de la crida de retorn no és vàlid."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "No s'ha pogut actualitzar l'aplicació."
@@ -1432,7 +1432,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel·la"
@@ -1902,6 +1902,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Fes l'usuari un administrador del grup"
@@ -2350,6 +2356,110 @@ msgstr "No ets membre d'aquest grup."
msgid "%1$s left group %2$s"
msgstr "%1$s ha abandonat el grup %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ja hi heu iniciat una sessió."
@@ -2590,8 +2700,8 @@ msgid "Connected applications"
msgstr "Aplicacions connectades"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Heu permès les aplicacions següents accedir al vostre compte."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2616,7 +2726,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "L'avís no té cap perfil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estat de %1$s a %2$s"
@@ -2783,8 +2893,8 @@ msgid "Paths"
msgstr "Camins"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Camí i paràmetres del servidor d'aquest lloc StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3645,8 +3755,8 @@ msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Paràmetres de sessió d'aquest lloc StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3665,7 +3775,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Activa la sortida de depuració per a les sessions."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Desa els paràmetres del lloc"
@@ -4589,75 +4698,79 @@ msgstr ""
"llicència del lloc, «%2$s»."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Usuari"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Paràmetres d'usuari d'aquest lloc StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Límit de la biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Límit màxim de la biografia d'un perfil (en caràcters)."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Usuaris nous"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Benvinguda als usuaris nous"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Subscripció per defecte"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Subscriviu automàticament els usuaris nous a aquest usuari."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitacions"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "S'han habilitat les invitacions"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Si es permet als usuaris invitar-ne de nous."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoritza la subscripció"
@@ -4672,7 +4785,9 @@ msgstr ""
"us als avisos d'aquest usuari. Si no heu demanat subscriure-us als avisos de "
"ningú, feu clic a «Rebutja»."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Llicència"
@@ -4871,6 +4986,15 @@ msgstr "Versió"
msgid "Author(s)"
msgstr "Autoria"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Preferit"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4929,6 +5053,17 @@ msgstr "No s'és part del grup."
msgid "Group leave failed."
msgstr "La sortida del grup ha fallat."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Inici de sessió"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5014,18 +5149,18 @@ msgid "Problem saving notice."
msgstr "S'ha produït un problema en desar l'avís."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "S'ha proporcionat un tipus incorrecte per a saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5052,7 +5187,7 @@ msgid "Missing profile."
msgstr "Manca el perfil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "No s'ha pogut desar l'etiqueta."
@@ -5091,9 +5226,18 @@ msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
msgid "Could not delete subscription."
msgstr "No s'ha pogut eliminar la subscripció."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Us donem la benvinguda a %1$s, @%2$s!"
@@ -5417,19 +5561,19 @@ msgstr ""
"llicència %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Anteriors"
@@ -5539,6 +5683,11 @@ msgstr "Edita l'avís del lloc"
msgid "Snapshots configuration"
msgstr "Configuració de les instantànies"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5624,38 +5773,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL on redirigir-hi després de l'autenticació."
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navegador"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Escriptori"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipus d'aplicació, navegador o escriptori"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Només lectura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lectura i escriptura"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancel·la"
@@ -6152,10 +6301,6 @@ msgstr "Deixa de tenir com a preferit aquest avís"
msgid "Favor this notice"
msgstr "Fes preferit aquest avís"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Preferit"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6173,8 +6318,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportació de les dades"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6367,10 +6512,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Font %d de la safata d'entrada desconeguda."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Inici de sessió"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Deixa"
@@ -7064,7 +7205,7 @@ msgstr "Repeteix l'avís"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca el rol «%s» de l'usuari"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
@@ -7291,17 +7432,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7309,12 +7450,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7322,12 +7463,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7335,12 +7476,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7348,7 +7489,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "fa un any"
@@ -7361,3 +7502,17 @@ msgstr "%s no és un color vàlid!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 2c8d855c4..45201471e 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:28+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:17+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -81,7 +81,7 @@ msgstr "uložit nastavení přístupu"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Uložit"
@@ -687,7 +687,7 @@ msgstr "Nebyl nalezen."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maximální délka notice je %d znaků včetně přiložené URL."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Nepodporovaný formát."
@@ -882,9 +882,8 @@ msgid "Yes"
msgstr "Ano"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Zablokovat tohoto uživatele"
@@ -1020,7 +1019,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Nastal problém s vaším session tokenem."
@@ -1120,56 +1119,56 @@ msgid "Design"
msgstr "Vzhled"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Nastavení vzhledu pro tuto stránku StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Neplatná URL loga."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Téma není k dispozici: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Změňte logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo stránek"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Změnit téma"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Téma stránek"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Téma stránek"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Vlastní téma"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Změnit obrázek na pozadí"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadí"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1178,75 +1177,76 @@ 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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "zap."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "vyp."
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Zapněte nebů vypněte obrázek na pozadí."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Dlaždicovat obrázek na pozadí"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Změnit barvy"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Obsah"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Boční panel"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Odkazy"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Rozšířené"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Vlastní CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Použít výchozí"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Obnovit výchozí vzhledy"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reset zpět do výchozího"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Uložit"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Uložit vzhled"
@@ -1324,7 +1324,7 @@ msgstr "Callback je příliš dlouhý."
msgid "Callback URL is not valid."
msgstr "Callback URL není platný."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Nelze aktualizovat aplikaci."
@@ -1417,7 +1417,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Zrušit"
@@ -1885,6 +1885,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Uďelat uživatele adminem skupiny"
@@ -2327,6 +2333,110 @@ msgstr "Nejste členem této skupiny."
msgid "%1$s left group %2$s"
msgstr "%1$s opustil(a) skupinu %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Již přihlášen"
@@ -2563,8 +2673,8 @@ msgid "Connected applications"
msgstr "Propojené aplikace"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Těmto aplikacím jste povolili přístup ke svému ůčtu."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2587,7 +2697,7 @@ msgstr "Vývojáři mohou upravovat nastavení registrace jejich aplikací "
msgid "Notice has no profile."
msgstr "Uživatel nemá profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "status %1 na %2"
@@ -2753,8 +2863,8 @@ msgid "Paths"
msgstr "Cesty"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Nastavení cest a serveru pro tuto stránku StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3600,8 +3710,8 @@ msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Nastavení sessions pro tuto stránku StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3620,7 +3730,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Zapnout výstup pro debugování sessions"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Uložit Nastavení webu"
@@ -4532,74 +4641,78 @@ msgstr ""
"Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Uživatel"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Nastavení uživatelů pro tuto stránku StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Neplatný bio limit. Musí být číslo."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Neplatné uvítací text. Max délka je 255 znaků."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Neplatné výchozí přihlášení: '%1$s' není uživatel."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limit Bia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Maximální počet znaků bia profilu."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Noví uživatelé"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Uvítání nového uživatele"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Uvítání nových uživatel (Max 255 znaků)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Výchozí odběr"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Automaticky přihlásit nové uživatele k tomuto uživateli."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Pozvánky"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Pozvánky povoleny"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizujte přihlášení"
@@ -4614,7 +4727,9 @@ msgstr ""
"sdělení tohoto uživatele. Pokud jste právě nepožádali o přihlášení k tomuto "
"uživteli, klikněte na \"Zrušit\""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licence"
@@ -4813,6 +4928,15 @@ msgstr "Verze"
msgid "Author(s)"
msgstr "Autoři"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Oblíbit"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4869,6 +4993,17 @@ msgstr "Není součástí skupiny."
msgid "Group leave failed."
msgstr "Nepodařilo se opustit skupinu."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Připojit se"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4953,18 +5088,18 @@ msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "saveKnownGroups obdrželo špatný typ."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problém při ukládání skupinového inboxu"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4989,7 +5124,7 @@ msgid "Missing profile."
msgstr "Chybějící profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Nelze uložit tag."
@@ -5028,9 +5163,18 @@ msgstr "Nelze smazat OMB token přihlášení."
msgid "Could not delete subscription."
msgstr "Nelze smazat odebírání"
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Vítejte na %1$s, @%2$s!"
@@ -5349,19 +5493,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Před"
@@ -5469,6 +5613,11 @@ msgstr "Upravit oznámení stránky"
msgid "Snapshots configuration"
msgstr "Konfigurace snímků"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5554,37 +5703,37 @@ msgid "URL to redirect to after authentication"
msgstr "URL pro přesměrování po autentikaci"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Prohlížeč"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Typ aplikace, prohlížeč nebo desktop"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "pouze pro čtení"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "čtení a zápis"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Zrušit"
@@ -6081,10 +6230,6 @@ msgstr "Odebrat toto oznámení z oblíbených"
msgid "Favor this notice"
msgstr "Přidat toto oznámení do oblíbených"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Oblíbit"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6102,8 +6247,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportovat data"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6297,10 +6442,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Neznámý zdroj inboxu %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Připojit se"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Opustit"
@@ -6992,7 +7133,7 @@ msgstr "Opakovat toto oznámení"
msgid "Revoke the \"%s\" role from this user"
msgstr "Odebrat uživateli roli \"%s\""
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Nenastaven uživatel pro jednouživatelský mód"
@@ -7219,17 +7360,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7238,12 +7379,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7252,12 +7393,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7266,12 +7407,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7280,7 +7421,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "asi před rokem"
@@ -7293,3 +7434,17 @@ msgstr "%s není platná barva!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s není platná barva! Použijte 3 nebo 6 hex znaků."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 488347944..03a641779 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:30+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:18+0000\n"
"Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: da\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ msgstr "Gem adgangsindstillinger"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Gem"
@@ -688,7 +688,7 @@ msgstr "Ikke fundet."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max meddelelse størrelse er %d tegn, inklusiv vedlagt URL."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formatet understøttes ikke"
@@ -884,9 +884,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloker denne bruger"
@@ -1022,7 +1021,7 @@ msgstr "Du er ikke ejer af dette program."
#. TRANS: Client error text when there is a problem with the session token.
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Der var et problem med din session token."
@@ -1122,56 +1121,56 @@ msgid "Design"
msgstr "Design"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Design indstillinger for dette StatusNet site."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Ugyldig logo URL."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema ikke tilgængelige: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Skift logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Skift tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Site tema"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema for webstedet."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Brugerdefineret tema"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Du kan uploade en brugerdefineret StatusNet tema som en. ZIP arkiv."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Skift baggrundsbillede"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Baggrund"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1181,75 +1180,76 @@ msgstr ""
"er %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Til"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Fra"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Slå baggrundsbilledet til eller fra."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tile baggrundsbillede"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Skift farver"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Indhold"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidebar"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Henvisninger"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avanceret"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Personlig CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Brug standardindstillinger"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Gendan standard indstillinger"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Nulstil til standard værdier"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Gem"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Gem design"
@@ -1327,7 +1327,7 @@ msgstr "Callback er for lang."
msgid "Callback URL is not valid."
msgstr "Tilbagekaldswebadresse er ikke gyldig."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Kunne ikke opdatere programmet."
@@ -1420,7 +1420,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Afbryd"
@@ -1890,6 +1890,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Gør bruger til administrator af gruppen"
@@ -2334,6 +2340,110 @@ msgstr "Du er ikke medlem af denne gruppe."
msgid "%1$s left group %2$s"
msgstr "%1$s forlod gruppe %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allerede logget ind"
@@ -2572,8 +2682,8 @@ msgid "Connected applications"
msgstr "Tilsluttede programmer"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Du har tilladt følgende programmer at få adgang din konto."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2704,6 +2814,10 @@ msgstr ""
msgid "Paths"
msgstr ""
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:163
#, php-format
msgid "Avatar directory not writable: %s."
@@ -3196,6 +3310,10 @@ msgstr ""
msgid "Sessions"
msgstr ""
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site"
+msgstr ""
+
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
msgstr ""
@@ -3663,58 +3781,66 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr ""
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr ""
@@ -3838,6 +3964,15 @@ msgstr ""
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3877,6 +4012,17 @@ msgstr ""
msgid "Group leave failed."
msgstr ""
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr ""
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3924,18 +4070,18 @@ msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3964,9 +4110,18 @@ msgstr ""
msgid "Not subscribed!"
msgstr ""
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4175,13 +4330,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr ""
@@ -4245,6 +4400,11 @@ msgstr ""
msgid "Snapshots configuration"
msgstr ""
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4298,32 +4458,32 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
@@ -4642,10 +4802,6 @@ msgstr ""
msgid "Database error"
msgstr ""
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -4663,7 +4819,7 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
+msgid "Feeds"
msgstr ""
#: lib/galleryaction.php:121
@@ -4831,10 +4987,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr ""
-
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
msgstr ""
@@ -5276,7 +5428,7 @@ msgstr ""
msgid "Recent tags"
msgstr ""
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5437,17 +5589,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5455,12 +5607,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5468,12 +5620,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5481,12 +5633,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5494,7 +5646,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr ""
@@ -5502,3 +5654,17 @@ msgstr ""
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 5664d6cd5..7e289ca16 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:32+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:19+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "Zugangs-Einstellungen speichern"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Speichern"
@@ -709,7 +709,7 @@ msgstr ""
"Die maximale Größe von Nachrichten ist %d Zeichen, inklusive der URL der "
"Anhänge"
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Bildformat wird nicht unterstützt."
@@ -906,9 +906,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Diesen Benutzer blockieren"
@@ -1044,7 +1043,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1144,56 +1143,56 @@ msgid "Design"
msgstr "Design"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Design-Einstellungen für diese StatusNet-Website."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Ungültige URL für das Logo"
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Theme nicht verfügbar: %s"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Logo ändern"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Seitenlogo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Theme ändern"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Seitentheme"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Theme dieser Seite."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Angepasster Skin"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Hintergrundbild ändern"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Hintergrund"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1203,75 +1202,76 @@ msgstr ""
"Dateigröße beträgt %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "An"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Aus"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Hintergrundbild ein- oder ausschalten."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Hintergrundbild kacheln"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Farben ändern"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Inhalt"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Seitenleiste"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Erweitert"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Eigene CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardeinstellungen benutzen"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standard-Design wiederherstellen"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standard wiederherstellen"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Speichern"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Design speichern"
@@ -1350,7 +1350,7 @@ msgstr "Antwort ist zu lang"
msgid "Callback URL is not valid."
msgstr "Antwort-URL ist nicht gültig"
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Konnte Programm nicht aktualisieren."
@@ -1443,7 +1443,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Abbrechen"
@@ -1916,6 +1916,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Blockieren"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
@@ -2368,6 +2374,110 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
msgid "%1$s left group %2$s"
msgstr "%1$s hat die Gruppe %2$s verlassen"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Bereits angemeldet."
@@ -2607,10 +2717,8 @@ msgid "Connected applications"
msgstr "Verbundene Programme"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
-"Du hast das folgende Programm die Erlaubnis erteilt sich mit deinem Profil "
-"zu verbinden."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2635,7 +2743,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Nachricht hat kein Profil"
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status von %1$s auf %2$s"
@@ -2800,8 +2908,8 @@ msgid "Paths"
msgstr "Pfad"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Pfad- und Serverangaben für diese StatusNet-Website."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3664,8 +3772,8 @@ msgid "Sessions"
msgstr "Sitzung"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Sitzungs-Einstellungen für diese StatusNet-Website."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3684,7 +3792,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Fehleruntersuchung für Sitzungen aktivieren"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Site-Einstellungen speichern"
@@ -4607,74 +4714,78 @@ msgstr ""
"$s“."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Benutzer"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Nutzer-Einstellungen dieser StatusNet-Seite."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ungültiges Abonnement: „%1$s“ ist kein Benutzer"
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Bio-Limit"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Maximale Länge in Zeichen der Profil-Bio."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Neue Nutzer"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Neue Benutzer empfangen"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Willkommens-Nachricht für neue Nutzer (maximal 255 Zeichen)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Standard-Abonnement"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Neue Nutzer abonnieren automatisch diesen Nutzer"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Einladungen"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Einladungen aktivieren"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Ist es Nutzern erlaubt neue Nutzer einzuladen."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonnement bestätigen"
@@ -4689,7 +4800,9 @@ msgstr ""
"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
"„Abbrechen“."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Lizenz"
@@ -4889,6 +5002,15 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Autor(en)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Zu Favoriten hinzufügen"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4947,6 +5069,17 @@ msgstr "Nicht Mitglied der Gruppe"
msgid "Group leave failed."
msgstr "Konnte Gruppe nicht verlassen"
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Beitreten"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5032,19 +5165,19 @@ msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
"Der Methode saveKnownGroups wurde ein schlechter Wert zur Verfügung gestellt"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5073,7 +5206,7 @@ msgid "Missing profile."
msgstr "Benutzer hat kein Profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Konnte Seitenbenachrichtigung nicht speichern."
@@ -5107,9 +5240,18 @@ msgstr "Konnte OMB-Abonnement-Token nicht löschen."
msgid "Could not delete subscription."
msgstr "Konnte Abonnement nicht löschen."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Herzlich willkommen bei %1$s, @%2$s!"
@@ -5432,19 +5574,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Vorher"
@@ -5552,6 +5694,11 @@ msgstr "Seitennachricht bearbeiten"
msgid "Snapshots configuration"
msgstr "Snapshot-Konfiguration"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5635,39 +5782,39 @@ msgid "URL to redirect to after authentication"
msgstr "aufzurufende Adresse nach der Authentifizierung"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Browser"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Arbeitsfläche"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Typ der Anwendung, Browser oder Arbeitsfläche"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Schreibgeschützt"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lese/Schreibzugriff"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/"
"Schreibzugriff"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Abbrechen"
@@ -6163,10 +6310,6 @@ msgstr "Aus Favoriten entfernen"
msgid "Favor this notice"
msgstr "Zu den Favoriten hinzufügen"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Zu Favoriten hinzufügen"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6184,8 +6327,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Daten exportieren"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6379,10 +6522,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Unbekannte inbox-Quelle %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Beitreten"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Verlassen"
@@ -7077,7 +7216,7 @@ msgstr "Diese Nachricht wiederholen"
msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
@@ -7303,17 +7442,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7321,12 +7460,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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7334,12 +7473,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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7347,12 +7486,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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7360,7 +7499,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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -7373,3 +7512,17 @@ msgstr "%s ist keine gültige Farbe!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
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)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index b0b3d9454..0bb8e5d23 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:38+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:19+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Save access settings"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Save"
@@ -677,7 +677,7 @@ msgstr "Not found."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max notice size is %d chars, including attachment URL."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Unsupported format."
@@ -872,9 +872,8 @@ msgid "Yes"
msgstr "Yes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Block this user"
@@ -1010,7 +1009,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1111,52 +1110,52 @@ msgid "Design"
msgstr "Design"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Design settings for this StausNet site."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "nvalid logo URL."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Theme not available: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Change logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Site logo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Change theme"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Site theme"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Theme for the site."
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Change background image"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Background"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1166,75 +1165,76 @@ msgstr ""
"$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Turn background image on or off."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tile background image"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Change colours"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Content"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidebar"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Use defaults"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restore default designs"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reset back to default"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Save"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Save design"
@@ -1312,7 +1312,7 @@ msgstr "Callback is too long."
msgid "Callback URL is not valid."
msgstr "Callback URL is not valid."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Could not update application."
@@ -1405,7 +1405,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel"
@@ -1871,6 +1871,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Make user an admin of the group"
@@ -2309,6 +2315,110 @@ msgstr "You are not a member of that group."
msgid "%1$s left group %2$s"
msgstr "%1$s left group %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Already logged in."
@@ -2543,6 +2653,10 @@ msgstr "You have not registered any applications yet."
msgid "Connected applications"
msgstr "Connected applications"
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access your account."
+msgstr ""
+
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
msgstr "You are not a user of that application."
@@ -2564,7 +2678,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Notice has no profile."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s's status on %2$s"
@@ -2723,6 +2837,10 @@ msgstr "Password saved."
msgid "Paths"
msgstr ""
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -3495,8 +3613,8 @@ msgid "User is already sandboxed."
msgstr "User is already sandboxed."
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3515,7 +3633,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Save site settings"
@@ -4372,62 +4489,70 @@ msgstr ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "User"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profile"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "New users"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Default subscription"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Automatically subscribe new users to this user."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitations"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invitations enabled"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Authorise subscription"
@@ -4442,7 +4567,9 @@ msgstr ""
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Reject”."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "License"
@@ -4630,6 +4757,15 @@ msgstr "Version"
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Favour"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4679,6 +4815,17 @@ msgstr "Not part of group."
msgid "Group leave failed."
msgstr "Group leave failed."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Join"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4762,18 +4909,18 @@ msgid "Problem saving notice."
msgstr "Problem saving notice."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problem saving group inbox."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4817,9 +4964,18 @@ msgstr "Could not delete subscription OMB token."
msgid "Could not delete subscription."
msgstr "Could not delete subscription."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welcome to %1$s, @%2$s!"
@@ -5138,19 +5294,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Before"
@@ -5258,6 +5414,11 @@ msgstr "Edit site notice"
msgid "Snapshots configuration"
msgstr "Snapshots configuration"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5331,37 +5492,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancel"
@@ -5773,10 +5934,6 @@ msgstr "Disfavour this notice"
msgid "Favor this notice"
msgstr "Favour this notice"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Favour"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -5794,8 +5951,8 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Export data"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5988,10 +6145,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Join"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Leave"
@@ -6587,7 +6740,7 @@ msgstr "Repeat this notice"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoke the \"%s\" role from this user"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6793,17 +6946,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6811,12 +6964,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6824,12 +6977,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6837,12 +6990,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6850,7 +7003,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "about a year ago"
@@ -6863,3 +7016,17 @@ msgstr "%s is not a valid colour!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 49aef778d..05e6ea6a9 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:36+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:20+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ msgstr "Konservu atingan agordon"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Konservu"
@@ -692,7 +692,7 @@ msgstr "Ne troviĝas."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Longlimo por avizo estas %d signoj, enkalkulante ankaŭ la retadresojn."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato ne subtenata."
@@ -886,9 +886,8 @@ msgid "Yes"
msgstr "Jes"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloki la uzanton"
@@ -1024,7 +1023,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Problemo okazas pri via seancĵetono."
@@ -1123,56 +1122,56 @@ msgid "Design"
msgstr "Aspekto"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL por la emblemo nevalida."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Desegno ne havebla: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Ŝanĝi emblemon"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Reteja emblemo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Ŝanĝi desegnon"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Reteja desegno"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Desegno por la retejo"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Propra desegno"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Ŝanĝi fonbildon"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fono"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1180,75 +1179,76 @@ 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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "En"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "For"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Aktivigi aŭ senaktivigi fonbildon"
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Ripeti la fonbildon"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Ŝanĝi kolorojn"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Enhavo"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Flanka strio"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Teksto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Ligiloj"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Speciala"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Propra CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Uzu defaŭlton"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaŭri defaŭltajn desegnojn"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Redefaŭltiĝi"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Konservi"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Savi desegnon"
@@ -1267,7 +1267,7 @@ msgstr "Ne estas tia dokumento \"%s\""
#: actions/editapplication.php:54
msgid "Edit Application"
-msgstr "Redakti Aplikon"
+msgstr "Redakti Aplikaĵon"
#: actions/editapplication.php:66
msgid "You must be logged in to edit an application."
@@ -1326,7 +1326,7 @@ msgstr "Revokfunkcio estas tro longa."
msgid "Callback URL is not valid."
msgstr "Revokfunkcia URL estas nevalida."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Malsukcesis ĝisdatigi la aplikaĵon."
@@ -1419,7 +1419,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Nuligi"
@@ -1881,6 +1881,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Bloki"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Elekti uzanton grupestro."
@@ -2321,6 +2327,110 @@ msgstr "Vi ne estas grupano."
msgid "%1$s left group %2$s"
msgstr "%1$s eksaniĝis de grupo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Vi jam ensalutis."
@@ -2554,8 +2664,8 @@ msgid "Connected applications"
msgstr "Konektita aplikaĵo"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Vi permesis al jenaj aplikaĵoj aliradon al via konto."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2578,7 +2688,7 @@ msgstr "Programisto povas redakti registradan agordon de sia aplikaĵo "
msgid "Notice has no profile."
msgstr "Avizo sen profilo"
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stato de %1$s ĉe %2$s"
@@ -2743,8 +2853,8 @@ msgid "Paths"
msgstr "Vojoj"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Vojo kaj servila agordo por ĉi tiu StatusNet-retejo."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3116,7 +3226,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
"Tie ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet](http://status."
+"blogging) servo surbaze de Libera Programaro [StatusNet](http://status."
"net/). [Aniĝu](%%action.register%%) por konigi novaĵon pri vi mem al viaj "
"amikoj, familianoj, kaj kolegoj! ([Pli](%%doc.help%%))"
@@ -3575,11 +3685,11 @@ msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Vi ne rajtas provejigi uzantojn ĉe tiu ĉi retejo."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
-msgstr ""
+msgstr "La uzanto jam provejiĝis."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3588,8 +3698,8 @@ msgid "Sessions"
msgstr "Seancoj"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Seancaj agordoj por tiu ĉi StatusNet-retejo"
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3608,7 +3718,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Ŝalti sencimigadan eligon por seanco."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Konservi retejan agordon"
@@ -3829,10 +3938,10 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** estas uzanto-grupo ĉe %%site.name%%, [mikrobloga](http://en.wikipedia."
-"org/wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
-"(http://status.net/). [Aniĝu](%%action.register%%) por fariĝi parto de tiu "
-"ĉi grupo kaj multe pli! ([Pli](%%doc.help%%))"
+"**%s** estas uzanto-grupo ĉe %%%%site.name%%%%, [mikrobloga](http://en."
+"wikipedia.org/wiki/Micro-blogging) servo surbaze de Libera Programaro "
+"[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
#, php-format
@@ -4433,6 +4542,10 @@ msgstr "Avizofluo pri etikedo %s (RSS 2.0)"
msgid "Notice feed for tag %s (Atom)"
msgstr "Avizofluo pri etikedo %s (Atom)"
+#: actions/tagother.php:39
+msgid "No ID argument."
+msgstr "Neniu ID-argumento"
+
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
@@ -4480,10 +4593,18 @@ msgstr "Ne estas tiu etikedo."
msgid "You haven't blocked that user."
msgstr "Vi ne jam blokis la uzanton."
+#: actions/unsandbox.php:72
+msgid "User is not sandboxed."
+msgstr "La uzanto ne estas provejigita."
+
#: actions/unsilence.php:72
msgid "User is not silenced."
msgstr "Uzanto ne estas silentigita."
+#: actions/unsubscribe.php:77
+msgid "No profile ID in request."
+msgstr "Neniu profila ID petiĝas."
+
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
msgstr "Malabonita"
@@ -4496,74 +4617,78 @@ msgstr ""
"Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Uzanto"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Uzantaj agordoj por ĉi tiu StatusNet-retejo."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Nevalida biografia longlimo. Estu cifero."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Nevalida defaŭlta abono: '%1$s' ne estas uzanto."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profilo"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Longlimo de biografio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Longlimo de profila biografio, je literoj"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Novuloj"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Bonveno al novuloj"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Bonvena teksto al novaj uzantoj (apenaŭ 255 literoj)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Defaŭlta abono"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Aŭtomate aboni novajn uzantojn al ĉi tiu uzanto."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitoj"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invito ebliĝis"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Rajtigi abonon"
@@ -4577,7 +4702,9 @@ msgstr ""
"Bonvolu kontroli la detalojn por certigi ĉu vi deziras aboni la avizoj de ĉi "
"tiu uzanto. Se ne simple alklaku “Rifuzi\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licenco"
@@ -4771,6 +4898,15 @@ msgstr "Versio"
msgid "Author(s)"
msgstr "Aŭtoro(j)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Ŝati"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4827,6 +4963,17 @@ msgstr "Ne grupano."
msgid "Group leave failed."
msgstr "Malsukcesis foriri de grupo."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Aniĝi"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4864,23 +5011,30 @@ msgstr "Malsukcesis ĝisdatigi mesaĝon per nova URI"
#: classes/Notice.php:98
#, php-format
msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "Ne estas tia profilo(%1$d) rilate al avizo (%2$d)."
+
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:193
+#, php-format
+msgid "Database error inserting hashtag: %s"
+msgstr "Datumbaze eraris enmeti heketetikedo: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
#: classes/Notice.php:265
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Malsukcesis konservi avizon. Ĝi tro longas."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
#: classes/Notice.php:270
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Malsukcesis konservi avizon. Uzanto ne kontata."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
#: classes/Notice.php:276
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Tro da avizoj tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
#: classes/Notice.php:283
@@ -4888,31 +5042,32 @@ msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
+"Tro da refojado tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
#. TRANS: Client exception thrown when a user tries to post while being banned.
#: classes/Notice.php:291
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Vi estas blokita de afiŝi ĉe tiu ĉi retejo."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
#: classes/Notice.php:358 classes/Notice.php:385
msgid "Problem saving notice."
-msgstr ""
+msgstr "Malsukcesis konservi avizon."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "Fuŝa tipo donita al saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
-msgstr ""
+msgstr "Malsukcesis konservi grupan alvenkeston."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4922,41 +5077,120 @@ msgstr "RT @%1$s %2$s"
#: classes/Profile.php:737
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; ĝi ne ekzistas."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
#: classes/Profile.php:746
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
-msgstr ""
+msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; datumbaza eraro."
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+msgid "Missing profile."
+msgstr "Mankas profilo."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:338
+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
+msgid "You have been banned from subscribing."
+msgstr "Vi esatas blokita de aboni."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
#: classes/Subscription.php:80
msgid "Already subscribed!"
-msgstr ""
+msgstr "Jam abonato!"
+
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85
+msgid "User has blocked you."
+msgstr "La uzanto blokis vin."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
#: classes/Subscription.php:171
msgid "Not subscribed!"
+msgstr "Ne abonato!"
+
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+msgid "Could not delete self-subscription."
+msgstr "Ne eblas forigi abonon al vi mem."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: classes/Subscription.php:206
+msgid "Could not delete subscription OMB token."
+msgstr "Malsukcesis forigi abonan OMB-ĵetonon."
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+#: classes/Subscription.php:218
+msgid "Could not delete subscription."
+msgstr "Malsukcesis forigi abonon."
+
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
msgstr ""
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bonvenon al %1$s, @%2$s!"
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:496
+msgid "Could not create group."
+msgstr "Malsukcesis krei grupon."
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:506
+msgid "Could not set group URI."
+msgstr "Malsukcesis ĝisdatigi grupan URI."
+
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:529
+msgid "Could not set group membership."
+msgstr "Malsukcesis ĝisdatigi grupan anecon."
+
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:544
+msgid "Could not save local group info."
+msgstr "Malsukcesis lokan grupan informon."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109
+msgid "Change your profile settings"
+msgstr "Ŝanĝi vian profilan agordon."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116
+msgid "Upload an avatar"
+msgstr "Alŝuti vizaĝbildon"
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123
+msgid "Change your password"
+msgstr "Ŝanĝi vian pasvorton."
+
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
msgid "Change email handling"
-msgstr ""
+msgstr "Ŝanĝi retpoŝtan disponadon."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr ""
+msgstr "Desegni vian profilon"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
@@ -4979,6 +5213,11 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Sentitola paĝo"
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:449
+msgid "Primary site navigation"
+msgstr "Unua reteja navigado"
+
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:455
msgctxt "TOOLTIP"
@@ -5095,17 +5334,22 @@ msgstr "Serĉi"
#. TRANS: Menu item for site administration
#: lib/action.php:538 lib/adminpanelaction.php:387
msgid "Site notice"
-msgstr ""
+msgstr "Reteja anonco"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:605
msgid "Local views"
msgstr "Loka vido"
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:675
+msgid "Page notice"
+msgstr "Paĝa anonco"
+
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:778
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Dua reteja navigado"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
#: lib/action.php:784
@@ -5161,12 +5405,14 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
+"**%%site.name%%** estas mikrobloga servo kreite de [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:849
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** estas mikrobloga servo."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
#. TRANS: Make sure there is no whitespace between "]" and "(".
@@ -5179,13 +5425,21 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"Ĝi utiligas mikroblogilaron de [StatusNet](http://status.net/), versio %s, "
+"havebla sub la [GNU Affero Ĝenerala Publika Permesilo](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)."
+
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:872
+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:879
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+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.
@@ -5193,33 +5447,36 @@ msgstr ""
#, 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:890
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
+"rezervitaj."
#. TRANS: license message in footer.
#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
#: lib/action.php:904
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Antaŭe"
@@ -5231,32 +5488,48 @@ msgstr ""
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:203
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "Ankoraŭ ne eblas trakti foran enhavon."
#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
#: lib/activityutils.php:240
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Ankoraŭ ne eblas trakti enigitan XML-aĵon."
#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
#: lib/activityutils.php:245
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Ankoraŭ ne eblas trakti enigitan Base64-enhavon."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Vi ne rajtas ŝanĝi ĉe tiu ĉi retejo."
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+#: lib/adminpanelaction.php:108
+msgid "Changes to that panel are not allowed."
+msgstr "Malpermesas ŝanĝi agordon sur la panelon."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:222
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() ne jam realigita."
#. TRANS: Client error message
#: lib/adminpanelaction.php:250
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() ne jam realigita."
+
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:274
+msgid "Unable to delete design setting."
+msgstr "Malsukcesas forigi desegnan agordon."
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+msgid "Basic site configuration"
+msgstr "Baza reteja agordo"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:339
@@ -5264,106 +5537,196 @@ msgctxt "MENU"
msgid "Site"
msgstr "Retejo"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+msgid "Design configuration"
+msgstr "Desegna agordo"
+
+#. TRANS: Menu item for site administration
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+msgctxt "MENU"
+msgid "Design"
+msgstr "Desegno"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:353
+msgid "User configuration"
+msgstr "Uzanta agordo"
+
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
msgid "User"
msgstr "Uzanto"
#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+msgid "Access configuration"
+msgstr "Alira agordo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+msgid "Paths configuration"
+msgstr "Voja agordo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:377
+msgid "Sessions configuration"
+msgstr "Seanca agodo"
+
+#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:385
msgid "Edit site notice"
+msgstr "Redakti retejan anoncon"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:393
+msgid "Snapshots configuration"
+msgstr "Momentfota Agordo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
msgstr ""
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
-msgstr ""
+msgstr "API-fonto bezonas leg-skriba aliro, sed vi nur rajtas legi."
#. 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 "Ne estas aplikaĵo kun la kosumanta ŝlosilo."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Fuŝa aliro-ĵetono."
#. 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 "Ne estas uzanto kun tiu ĵetono."
#. 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 "Malsukcesis aŭtentigi vin."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Provis revoki nekonatan ĵetonon."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Malsukcesis forigi revokitan ĵetonon."
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:129
+msgid "Edit application"
+msgstr "Redakti aplikaĵon"
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+msgid "Icon for this application"
+msgstr "Emblemo por tiu ĉi aplikaĵo"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:200
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Priskribu vian aplikaĵon per malpli ol %d literoj."
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:204
+msgid "Describe your application"
+msgstr "Priskribu vian aplikaĵon"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:215
+msgid "URL of the homepage of this application"
+msgstr "URL al la hejmpaĝo de tiu ĉi aplikaĵo"
+
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:217
+msgid "Source URL"
+msgstr "Fonta URL"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224
+msgid "Organization responsible for this application"
+msgstr "Organizo, kiu prizorgi la aplikaĵon"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL al la hejmpaĝo de la organizo"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL por alidirekto post aŭtentigado"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
-msgstr ""
+msgstr "Foliumilo"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
-msgstr ""
+msgstr "Labortablo"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo de aplikaĵo, foliumilo aŭ labortablo"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
-msgstr ""
+msgstr "Nur-lege"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
-msgstr ""
+msgstr "Leg-skribe"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
-msgstr ""
+msgstr "Defaŭta aliro por la aplikaĵo: nur-lege aŭ leg-skribe."
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Nuligi"
#. TRANS: Application access type
#: lib/applicationlist.php:135
msgid "read-write"
-msgstr ""
+msgstr "leg-skribe"
#. TRANS: Application access type
#: lib/applicationlist.php:137
msgid "read-only"
-msgstr ""
+msgstr "nur-lege"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:143
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr "Permesita %1$s - aliro \"%2$s\"."
+
+#. TRANS: Button label
+#: lib/applicationlist.php:158
+msgctxt "BUTTON"
+msgid "Revoke"
+msgstr "Revoki"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5438,7 +5801,7 @@ msgstr "Ne povas trovi uzanton kun kromnomo %s."
#: lib/command.php:150
#, php-format
msgid "Could not find a local user with nickname %s."
-msgstr ""
+msgstr "Ne troviĝas loka uzanto kun alnomo %s."
#. TRANS: Error text shown when an unimplemented command is given.
#: lib/command.php:185
@@ -5468,6 +5831,9 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Abonatoj: %1$s\n"
+"Abonantoj: %2$s\n"
+"Avizoj: %3$s"
#. TRANS: Text shown when a notice has been marked as favourite successfully.
#: lib/command.php:314
@@ -5529,7 +5895,7 @@ msgstr ""
#: lib/command.php:491 lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgstr "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
#: lib/command.php:517
@@ -5577,27 +5943,27 @@ msgstr "Specifu nomon de la abonota uzanto."
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:664
msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
+msgstr "Malsukcesis aboni OMB-profilon per komando."
#. TRANS: Text shown after having subscribed to another user successfully.
#. TRANS: %s is the name of the user the subscription was requested for.
#: lib/command.php:672
#, php-format
msgid "Subscribed to %s."
-msgstr ""
+msgstr "%s abonita"
#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
#. TRANS: Error text shown when no username was provided when issuing the command.
#: lib/command.php:694 lib/command.php:804
msgid "Specify the name of the user to unsubscribe from."
-msgstr ""
+msgstr "Specifu la nomon de uzanto malabonota."
#. TRANS: Text shown after having unsubscribed from another user successfully.
#. TRANS: %s is the name of the user the unsubscription was requested for.
#: lib/command.php:705
#, php-format
msgid "Unsubscribed from %s."
-msgstr ""
+msgstr "%s malabonita."
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
@@ -5628,14 +5994,14 @@ msgstr "Malsukcesis ŝalti sciigon."
#. TRANS: Error text shown when issuing the login command while login is disabled.
#: lib/command.php:771
msgid "Login command is disabled."
-msgstr ""
+msgstr "Ensaluta komando malebliĝas."
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
#: lib/command.php:784
#, php-format
msgid "This link is useable only once and is valid for only 2 minutes: %s."
-msgstr ""
+msgstr "Ĉi tiu ligilo estas uzebla nur unufoje kaj valida nur 2 minutojn: %s."
#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
#. TRANS: %s is the name of the user the unsubscription was requested for.
@@ -5769,17 +6135,21 @@ msgstr ""
"tracks - ankoraŭ ne realigita.\n"
"tracking -ankoraŭ ne realigita.\n"
+#: lib/common.php:135
+msgid "No configuration file found. "
+msgstr "Ne troviĝas agorda dosiero. "
+
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Mi serĉis agordan dosieron je jenaj lokoj: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
#: lib/common.php:139
msgid "Go to the installer."
-msgstr ""
+msgstr "Al la instalilo."
#: lib/connectsettingsaction.php:110
msgid "IM"
@@ -5827,10 +6197,6 @@ msgstr "Neŝati la avizon"
msgid "Favor this notice"
msgstr "Ŝati la avizon"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Ŝati"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5848,8 +6214,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Elporti datumon"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5878,7 +6244,7 @@ msgstr "Iri"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Donu al la uzanto rolon \"%s\""
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -5995,14 +6361,27 @@ msgstr "Etikedoj en avizoj de gruop %s"
msgid "This page is not available in a media type you accept"
msgstr "La paĝo estas ne havebla je la komunikil-tipo, kiun vi akceptas"
+#: lib/imagefile.php:88
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "La dosiero tro grandas. Dosiera grandlimo estas %s."
+
+#: lib/imagefile.php:93
+msgid "Partial upload."
+msgstr "Parta alŝuto."
+
#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
#: lib/imagefile.php:101 lib/mediafile.php:179
msgid "System error uploading file."
-msgstr ""
+msgstr "Sisteme eraris alŝuti dosieron."
#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "Ne bildo aŭ dosiero difektita."
+
+#: lib/imagefile.php:122
+msgid "Lost our file."
+msgstr "Perdiĝis nian dosieron."
#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
@@ -6026,10 +6405,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Nekonata alvenkesta fonto %d"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Aniĝi"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Forlasi"
@@ -6064,6 +6439,18 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Saluton, %s.\n"
+"\n"
+"Iu ĵus entajpis tiun ĉi retpoŝtadreson ĉe %s.\n"
+"\n"
+"Se faris vi tion, kaj vi volas konfirmi vian eniron, uzu la URL sube:\n"
+"\n"
+"%s\n"
+"\n"
+"Se ne, simple ignoru ĉi mesaĝon.\n"
+"\n"
+"Dankon por via tempo,\n"
+"%s\n"
#. TRANS: Subject of new-subscriber notification e-mail
#: lib/mail.php:243
@@ -6095,6 +6482,16 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s nun rigardas vian avizojn ĉe %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"fidele via,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Ŝanĝu vian retpoŝtadreson aŭ la sciigan agordon ĉe %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
#: lib/mail.php:274
@@ -6121,6 +6518,14 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Vi havas novan afiŝan adreson ĉe %1$s.\n"
+"\n"
+"Sendu mesaĝon al %2$s por afiŝii novan avizon.\n"
+"\n"
+"Pli da retpoŝta gvido troviĝas ĉe %3$s.\n"
+"\n"
+"Fidele via,\n"
+"%4$s"
#. TRANS: Subject line for SMS-by-email notification messages
#: lib/mail.php:433
@@ -6161,6 +6566,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) scivolas, kion faras vi lastatempe kaj invitas al vi afiŝi kelke "
+"da novaĵoj.\n"
+"\n"
+"Do sciigu nin pri vi :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Ne respondu al tiu ĉi mesaĝo; ili ne ricevos ĝin.\n"
+"\n"
+"kun bona espero,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
#: lib/mail.php:536
@@ -6187,6 +6603,20 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) sendis al vi privatan mesaĝon:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Vi povas respondi al lia mesaĝon jene:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Ne respondu al tiu ĉi mesaĝon; li ne ricevos ĝin.\n"
+"\n"
+"Kun bona espero,\n"
+"%5$s\n"
#. TRANS: Subject for favorite notification email
#: lib/mail.php:589
@@ -6215,6 +6645,22 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) ĵus aldoniss vian mesaĝon ĉe %2$s al sia ŝatolisto.\n"
+"\n"
+"La URL de via avizo estas:\n"
+"\n"
+"%3$s\n"
+"\n"
+"La enhavo de via avizo estas:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Vi povas legi la ŝatoliston de %1$s jene:\n"
+"\n"
+"%5$s\n"
+"\n"
+"fidele via,\n"
+"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
#: lib/mail.php:651
@@ -6231,7 +6677,7 @@ msgstr ""
#: lib/mail.php:657
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) afiŝis avizon al vi"
#. TRANS: Body of @-reply notification e-mail.
#: lib/mail.php:660
@@ -6260,6 +6706,28 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) ĵus afiŝis al vi (\"@-respondo\") ĉe %2$s.\n"
+"\n"
+"La avizo estas jene:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Kaj enhavas:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sVi povas re-respondi jene:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"Listo de ĉiuj @-respondoj al vi estas jene:\n"
+"\n"
+"%7$s\n"
+"\n"
+"fidele via,\n"
+"%2$s\n"
+"\n"
+"P.S. Vi rajtas malŝalti tian ĉi retpoŝtan sciigon ĉi tie: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6277,15 +6745,34 @@ msgstr ""
msgid "from"
msgstr "de"
+#: lib/mailhandler.php:42
+msgid "Not a registered user."
+msgstr "Ne registrita uzanto"
+
+#: lib/mailhandler.php:46
+msgid "Sorry, that is not your incoming email address."
+msgstr "Pardonon, tiu ne estas via alvena retpoŝtadreso."
+
+#: lib/mailhandler.php:50
+msgid "Sorry, no incoming email allowed."
+msgstr "Pardonon, neniu alvena mesaĝo permesiĝas."
+
+#: lib/mailhandler.php:228
+#, php-format
+msgid "Unsupported message type: %s"
+msgstr "Nesubtenata mesaĝo-tipo: %s"
+
#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
#: lib/mediafile.php:99 lib/mediafile.php:125
msgid "There was a database error while saving your file. Please try again."
-msgstr ""
+msgstr "Databaze eraris konservi vian dosieron. Bonvole reprovu."
#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
#: lib/mediafile.php:145
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"Alŝutata dosiero superas la dosierujon upload_max_filesize (alŝuta "
+"grandlimo) en php.ini."
#. TRANS: Client exception.
#: lib/mediafile.php:151
@@ -6293,21 +6780,23 @@ msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Alŝutata dosiero superas la dosierujon MAX_FILE_SIZE (Alŝuta grandlimo) "
+"difinitan per HTML formo."
#. TRANS: Client exception.
#: lib/mediafile.php:157
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Alŝutata dosiero venas nur parte."
#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
#: lib/mediafile.php:165
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Mankas labora dosierujo."
#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
#: lib/mediafile.php:169
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Malsukcesis skribi dosieron al disko."
#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
#: lib/mediafile.php:173
@@ -6317,13 +6806,19 @@ msgstr ""
#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
#: lib/mediafile.php:189 lib/mediafile.php:232
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "Dosiera grandeco superas uzantan kvoton."
#. TRANS: Client exception thrown when a file upload operation fails because the file could
#. TRANS: not be moved from the temporary folder to the permanent file location.
#: lib/mediafile.php:209 lib/mediafile.php:251
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Dosiero ne povas translokiĝi al celata dosierujo."
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
+msgid "Could not determine file's MIME type."
+msgstr "Malsukcesis decidi dosieran MIME-tipon."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
@@ -6334,17 +6829,19 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" ne estas subtenata tipo ĉe tiu ĉi servilo. Provu per plu da %2$s "
+"formato."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "\"%s\" ne estas subtenata tipo ĉe tiu ĉi servilo."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Sendi rektan avizon"
#: lib/messageform.php:146
msgid "To"
@@ -6359,6 +6856,10 @@ msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Sendi"
+#: lib/noticeform.php:160
+msgid "Send a notice"
+msgstr "Sendi avizon"
+
#: lib/noticeform.php:174
#, php-format
msgid "What's up, %s?"
@@ -6419,12 +6920,16 @@ msgstr "al"
#: lib/noticelist.php:502
msgid "web"
-msgstr "reto"
+msgstr "TTT"
#: lib/noticelist.php:568
msgid "in context"
msgstr "kuntekste"
+#: lib/noticelist.php:603
+msgid "Repeated by"
+msgstr "Ripetita de"
+
#: lib/noticelist.php:630
msgid "Reply to this notice"
msgstr "Respondi ĉi tiun avizon"
@@ -6490,23 +6995,60 @@ msgstr "Alvenkesto"
msgid "Your incoming messages"
msgstr "Viaj alvenaj mesaĝoj"
+#: lib/personalgroupnav.php:130
+msgid "Outbox"
+msgstr "Elirkesto"
+
+#: lib/personalgroupnav.php:131
+msgid "Your sent messages"
+msgstr "Viaj senditaj mesaĝoj"
+
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Etikedoj en avizoj de %s"
+
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:116
+msgid "Unknown"
+msgstr "Nekonata"
+
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "Abonatoj"
#: lib/profileaction.php:126
msgid "All subscriptions"
-msgstr ""
+msgstr "Ĉiuj abonatoj"
+
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "Abonantoj"
+
+#: lib/profileaction.php:161
+msgid "All subscribers"
+msgstr "Ĉiuj abonantoj"
+
+#: lib/profileaction.php:191
+msgid "User ID"
+msgstr "Uzanta ID"
+
+#: lib/profileaction.php:196
+msgid "Member since"
+msgstr "Ano ekde"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Taga meznombro"
+
+#: lib/profileaction.php:264
+msgid "All groups"
+msgstr "Ĉiuj grupoj"
#: lib/profileformaction.php:123
msgid "Unimplemented method."
-msgstr ""
+msgstr "Nerealiĝita metodo"
#: lib/publicgroupnav.php:78
msgid "Public"
@@ -6520,17 +7062,42 @@ msgstr "Uzantaj grupoj"
msgid "Recent tags"
msgstr "Freŝaj etikedoj"
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "Elstara"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "Populara"
+
+#: lib/repeatform.php:107
+msgid "Repeat this notice?"
+msgstr "Ĉu ripeti la avizon?"
+
#: lib/repeatform.php:132
msgid "Yes"
msgstr "Jes"
-#: lib/router.php:709
+#: lib/repeatform.php:132
+msgid "Repeat this notice"
+msgstr "Ripeti la avizon"
+
+#: lib/revokeroleform.php:91
+#, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "Revoki rolon %s de la uzanto"
+
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Neniu difinata uzanto por sol-uzanta reĝimo."
#: lib/sandboxform.php:67
msgid "Sandbox"
-msgstr ""
+msgstr "Provejo"
+
+#: lib/sandboxform.php:78
+msgid "Sandbox this user"
+msgstr "Provejigi la uzanton"
#. TRANS: Fieldset legend for the search form.
#: lib/searchaction.php:121
@@ -6571,7 +7138,7 @@ msgstr "Serĉi grupon ĉe la retejo"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Sentitola sekcio"
#: lib/section.php:106
msgid "More..."
@@ -6621,43 +7188,55 @@ msgstr ""
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr ""
+msgstr "Nenio"
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
-msgstr ""
+msgstr "Ĉi tiu servilo ne povas disponi desegnan alŝuton sen ZIP-a subteno."
#: lib/themeuploader.php:58 lib/themeuploader.php:61
msgid "The theme file is missing or the upload failed."
-msgstr ""
+msgstr "La desegna dosiero mankas aŭ malsukcesis alŝuti."
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297
+msgid "Failed saving theme."
+msgstr "Malsukcesis konservi desegnon."
#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
-msgstr ""
+msgstr "Nevalida desegno: fuŝa dosieruja sturkturo."
#: lib/themeuploader.php:166
#, php-format
msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgstr "Alŝutata desegno tro grandas; ĝi estu apenaŭ %d bitoj sen densigado."
#: lib/themeuploader.php:178
msgid "Invalid theme archive: missing file css/display.css"
-msgstr ""
+msgstr "Nevalida desegna arkivo: mankas dosiero css/display.css"
#: lib/themeuploader.php:218
msgid ""
"Theme contains invalid file or folder name. Stick with ASCII letters, "
"digits, underscore, and minus sign."
msgstr ""
+"Desegno enhavas nevalidan dosieran aŭ dosierujan nomon. Uzu nur ASCII-"
+"literaron, ciferojn, substrekon kaj minussignon."
#: lib/themeuploader.php:224
msgid "Theme contains unsafe file extension names; may be unsafe."
-msgstr ""
+msgstr "Desegno enhavas malsekuran dosiersufikson; eble malsukuras."
#: lib/themeuploader.php:241
#, php-format
msgid "Theme contains file of type '.%s', which is not allowed."
-msgstr ""
+msgstr "Desegno enhavas dosieron de tipo \".%s\", kiu malpermesiĝas."
+
+#: lib/themeuploader.php:259
+msgid "Error opening theme archive."
+msgstr "Eraris malfermi desegnan arkivon."
#: lib/topposterssection.php:74
msgid "Top posters"
@@ -6665,7 +7244,11 @@ msgstr "Pintaj afiŝantoj"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Malprovejigi"
+
+#: lib/unsandboxform.php:80
+msgid "Unsandbox this user"
+msgstr "Malprovejigi la uzanton"
#: lib/unsilenceform.php:67
msgid "Unsilence"
@@ -6677,7 +7260,7 @@ msgstr "Nesilentigi la uzanton"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Malaboni la uzanton"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
@@ -6693,12 +7276,20 @@ msgstr "Nekonata ago"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "Forigante uzanton..."
+
+#: lib/userprofile.php:263
+msgid "Edit profile settings"
+msgstr "Redakti profilan agordon"
#: lib/userprofile.php:264
msgid "Edit"
msgstr "Redakti"
+#: lib/userprofile.php:287
+msgid "Send a direct message to this user"
+msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
+
#: lib/userprofile.php:288
msgid "Message"
msgstr "Mesaĝo"
@@ -6707,6 +7298,10 @@ msgstr "Mesaĝo"
msgid "Moderate"
msgstr "Moderigi"
+#: lib/userprofile.php:364
+msgid "User role"
+msgstr "Uzanta rolo"
+
#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
@@ -6718,58 +7313,87 @@ msgid "Moderator"
msgstr "Moderanto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1150
+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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1157
+msgid "about a year ago"
+msgstr "antaŭ ĉirkaŭ unu jaro"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s ne estas valida koloro!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr "%s ne estas valida koloro! Uzu 3 aŭ 6 deksesumaĵojn."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 22cd7512f..41d7689b9 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:40+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:21+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -86,7 +86,7 @@ msgstr "Guardar la configuración de acceso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Guardar"
@@ -181,8 +181,8 @@ 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 ""
-"Puedes intentar [zarandear a %1$s](../%2$s) desde su perfil o [publicar algo "
-"a ellos](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Puedes intentar [dar un toque a %1$s](../%2$s) desde su perfil o [publicar "
+"algo a ellos](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
#, php-format
@@ -660,17 +660,17 @@ msgstr "No puedes borrar el estado de otro usuario."
#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr "No existe ese aviso."
+msgstr "No existe ese mensaje."
#. TRANS: Error text shown when trying to repeat an own notice.
#: actions/apistatusesretweet.php:84 lib/command.php:538
msgid "Cannot repeat your own notice."
-msgstr "No puedes repetir tus propias notificaciones."
+msgstr "No puedes repetir tus propios mensajes"
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
#: actions/apistatusesretweet.php:92 lib/command.php:544
msgid "Already repeated that notice."
-msgstr "Esta notificación ya se ha repetido."
+msgstr "Este mensaje ya se ha repetido."
#: actions/apistatusesshow.php:139
msgid "Status deleted."
@@ -688,7 +688,7 @@ msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
-msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres."
+msgstr "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
msgid "Not found."
@@ -698,10 +698,9 @@ msgstr "No encontrado."
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-"El tamaño máximo de la notificación es %d caracteres, incluyendo el URL "
-"adjunto."
+"El tamaño máximo del mensaje es %d caracteres, incluyendo el URL adjunto."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato no soportado."
@@ -748,7 +747,7 @@ msgstr "Repeticiones de %s"
#: actions/apitimelinetag.php:105 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
-msgstr "Avisos etiquetados con %s"
+msgstr "Mensajes etiquetados con %s"
#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
@@ -896,9 +895,8 @@ msgid "Yes"
msgstr "Sí"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloquear este usuario."
@@ -1017,7 +1015,7 @@ msgstr "Conversación"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
-msgstr "Avisos"
+msgstr "Mensajes"
#: actions/deleteapplication.php:63
msgid "You must be logged in to delete an application."
@@ -1035,7 +1033,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1076,7 +1074,7 @@ msgstr "No conectado."
#: actions/deletenotice.php:71
msgid "Can't delete this notice."
-msgstr "No se puede eliminar este aviso."
+msgstr "No se puede eliminar este mensaje."
#: actions/deletenotice.php:103
msgid ""
@@ -1088,7 +1086,7 @@ msgstr ""
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
-msgstr "Borrar aviso"
+msgstr "Borrar mensaje"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
@@ -1102,7 +1100,7 @@ msgstr "No eliminar este mensaje"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
#: actions/deletenotice.php:158 lib/noticelist.php:657
msgid "Delete this notice"
-msgstr "Borrar este aviso"
+msgstr "Borrar este mensaje"
#: actions/deleteuser.php:67
msgid "You cannot delete users."
@@ -1136,56 +1134,56 @@ msgid "Design"
msgstr "Diseño"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Configuración de diseño de este sitio StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL de logotipo inválido."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema no disponible: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Cambiar logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo del sitio"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Cambiar el tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema del sitio"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema para el sitio."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Personalizar tema"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar la imagen de fondo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1195,81 +1193,82 @@ msgstr ""
"es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Activar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivar"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o desactivar la imagen de fondo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imagen de fondo en mosaico"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contenido"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Vínculos"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Personalizar CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar los valores predeterminados"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar los diseños predeterminados"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver a los valores predeterminados"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Guardar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Guardar el diseño"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr "¡Este aviso no es un favorito!"
+msgstr "Este mensaje no es un favorito!"
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -1341,7 +1340,7 @@ msgstr "La devolución de llamada es muy larga."
msgid "Callback URL is not valid."
msgstr "El URL de devolución de llamada es inválido."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "No fue posible actualizar la aplicación."
@@ -1434,7 +1433,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1490,7 +1489,7 @@ msgstr "Preferencias de correo electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:184
msgid "Send me notices of new subscriptions through email."
-msgstr "Enviarme avisos de suscripciones nuevas por correo."
+msgstr "Enviarme mensajes de nuevas suscripciones por correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:190
@@ -1513,12 +1512,12 @@ msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:209
msgid "Allow friends to nudge me and send me an email."
-msgstr "Permitir que amigos me contacten y envién un correo."
+msgstr "Permitir que amigos me den un toque y me envien un correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:216
msgid "I want to post notices by email."
-msgstr "Deseo enviar estados por email"
+msgstr "Quiero publicar mensajes por correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:223
@@ -1626,7 +1625,7 @@ msgstr "Nueva dirección de correo entrante agregada."
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr "¡Este aviso ya está en favoritos!"
+msgstr "¡Este mensaje ya está en favoritos!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
@@ -1673,7 +1672,7 @@ msgstr ""
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr "Avisos favoritos de %s"
+msgstr "Mensajes favoritos de %s"
#: actions/favoritesrss.php:115
#, php-format
@@ -1701,7 +1700,7 @@ msgstr "No hay ID de mensaje."
#: actions/file.php:38
msgid "No notice."
-msgstr "Sin aviso."
+msgstr "Sin mensaje."
#: actions/file.php:42
msgid "No attachments."
@@ -1906,6 +1905,12 @@ msgstr "Admin"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Bloquear"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1916,13 +1921,13 @@ msgstr "Convertir al usuario en administrador del grupo"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Convertir en administrador"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Convertir a este usuario en administrador"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -2083,18 +2088,18 @@ msgstr "Preferencias de mensajería instantánea"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:163
msgid "Send me notices through Jabber/GTalk."
-msgstr "Enviarme avisos por Jabber/GTalk"
+msgstr "Enviarme mensajes por Jabber/GTalk"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:169
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
+msgstr "Publicar un mensaje cuando el estado de mi Jabber/GTalk cambie."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:175
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr ""
-"Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
+"Enviarme respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:182
@@ -2354,6 +2359,110 @@ msgstr "No eres miembro de este grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha dejado el grupo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Ya estás conectado."
@@ -2503,7 +2612,7 @@ msgstr "Error de Ajax"
#: actions/newnotice.php:69
msgid "New notice"
-msgstr "Nuevo aviso"
+msgstr "Nuevo mensaje"
#: actions/newnotice.php:227
msgid "Notice posted"
@@ -2515,7 +2624,7 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
-"Buscar avisos en %%site.name%% por contenido. Separa los términos de "
+"Buscar mensajes en %%site.name%% por contenido. Separa los términos de "
"búsqueda con espacios; deben tener una longitud mínima de 3 caracteres."
#: actions/noticesearch.php:78
@@ -2561,8 +2670,8 @@ msgstr ""
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set their email yet."
msgstr ""
-"Este usuario no permite zarandeos o todavía no confirma o configura su "
-"correo electrónico."
+"Este usuario no permite que le den toques o todavía no ha confirmado o "
+"configurado su correo electrónico."
#: actions/nudge.php:94
msgid "Nudge sent"
@@ -2594,8 +2703,8 @@ msgid "Connected applications"
msgstr "Aplicaciones conectadas"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Has permitido a las siguientes aplicaciones acceder a tu cuenta."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2618,9 +2727,9 @@ msgstr ""
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
-msgstr "Aviso no tiene perfil."
+msgstr "Mensaje sin perfil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "estado de %1$s en %2$s"
@@ -2629,19 +2738,19 @@ msgstr "estado de %1$s en %2$s"
#: actions/oembed.php:159
#, php-format
msgid "Content type %s not supported."
-msgstr "Tipo de contenido %s no soportado."
+msgstr "Tipo de contenido %s no compatible."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:163
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr "Solamente %s URLs sobre HTTP simples por favor."
+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:1206
#: lib/apiaction.php:1233 lib/apiaction.php:1356
msgid "Not a supported data format."
-msgstr "No es un formato de dato soportado"
+msgstr "No es un formato de datos compatible."
#: actions/opensearch.php:64
msgid "People Search"
@@ -2649,7 +2758,7 @@ msgstr "Búsqueda de gente"
#: actions/opensearch.php:67
msgid "Notice Search"
-msgstr "Búsqueda de avisos"
+msgstr "Búsqueda de mensajes"
#: actions/othersettings.php:60
msgid "Other settings"
@@ -2757,7 +2866,7 @@ msgstr "Cambiar"
#: actions/passwordsettings.php:154 actions/register.php:237
msgid "Password must be 6 or more characters."
-msgstr "Cotrnaseña debe tener 6 o más caracteres."
+msgstr "La contraseña debe tener 6 o más caracteres."
#: actions/passwordsettings.php:157 actions/register.php:240
msgid "Passwords don't match."
@@ -2777,7 +2886,7 @@ msgstr "No se puede guardar la nueva contraseña."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
-msgstr "Se guardó Contraseña."
+msgstr "Se guardó la contraseña."
#. TRANS: Menu item for site administration
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
@@ -2785,9 +2894,8 @@ msgid "Paths"
msgstr "Rutas"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
-"Configuración de la ruta de acceso y del servidor de este sitio StatusNet."
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2847,7 +2955,7 @@ msgstr "URL agradables"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr "¿Usar URL agradables (más legibles y memorizables)?"
+msgstr "¿Usar URL amigables (más legibles y memorizables)?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2958,13 +3066,14 @@ msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
#: actions/postnotice.php:95
msgid "Invalid notice content."
-msgstr "Contenido de aviso inválido."
+msgstr "Contenido de mensaje inválido."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"La licencia del aviso %1$s’ es incompatible con la licencia del sitio ‘%2$s’."
+"La licencia del mensaje %1$s’ es incompatible con la licencia del sitio ‘%2"
+"$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -3194,7 +3303,7 @@ msgstr "Estas son las etiquetas recientes más populares en %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
-"Aún nadie ha publicado un aviso con una [etiqueta clave] (%%doc.tags%%)"
+"Aún nadie ha publicado un mensaje con una [etiqueta clave] (%%doc.tags%%)"
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -3620,8 +3729,8 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
"newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Puedes intentar [zarandear a %1$s](../%2$s) o [publicar algo a ellos](%%%%"
-"action.newnotice%%%%?status_textarea=%3$s)."
+"Puedes intentar [darle un toque a %1$s](../%2$s) o [publicar algo a su "
+"atención](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3655,8 +3764,8 @@ msgid "Sessions"
msgstr "Sesiones"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Configuración de sesión para este sitio StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3675,7 +3784,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Activar la salida de depuración para sesiones."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Guardar la configuración del sitio"
@@ -3766,7 +3874,7 @@ msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
#: actions/showfavorites.php:79
#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "Avisos favoritos de %1$s, página %2$d"
+msgstr "Mensajes favoritos de %1$s, página %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3854,17 +3962,17 @@ msgstr "Acciones del grupo"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Canal de avisos del grupo %s (RSS 1.0)"
+msgstr "Canal de mensajes del grupo %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Canal de avisos del grupo %s (RSS 2.0)"
+msgstr "Canal de mensajes del grupo %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr "Canal de avisos del grupo %s (Atom)"
+msgstr "Canal de mensajes del grupo %s (Atom)"
#: actions/showgroup.php:355
#, php-format
@@ -3942,7 +4050,7 @@ msgstr "Mensaje de %1$s en %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr "Aviso borrado"
+msgstr "Mensaje borrado"
#: actions/showstream.php:73
#, php-format
@@ -3998,8 +4106,8 @@ msgid ""
"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
"%?status_textarea=%2$s)."
msgstr ""
-"Puedes intentar zarandear a %1$s o [publicar algo a ellos](%%%%action."
-"newnotice%%%%?status_textarea=%2$s)."
+"Puedes intentar darle un toque a %1$s o [publicar algo a su atención](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -4140,7 +4248,7 @@ msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
#: actions/sitenoticeadminpanel.php:56
msgid "Site Notice"
-msgstr "Aviso del sitio"
+msgstr "Aviso del mensaje"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
@@ -4158,17 +4266,17 @@ msgstr ""
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "Texto del aviso del sitio"
+msgstr "Texto del mensaje del sitio"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
-"Texto del aviso que va a lo ancho del sitio (máximo 255 caracteres; se "
+"Texto del mensaje que va a lo ancho del sitio (máximo 255 caracteres; se "
"acepta HTML)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
-msgstr "Guardar el aviso del sitio"
+msgstr "Guardar el mensaje del sitio"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4240,8 +4348,8 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
-"Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
-"mi operador móvil"
+"Enviarme mensajes por SMS; Yo acepto que puede incurrir en grandes cobros "
+"por mi operador móvil"
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
@@ -4501,22 +4609,22 @@ msgstr "SMS"
#: actions/tag.php:69
#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Avisos etiquetados con %1$s, página %2$d"
+msgstr "Mensajes etiquetados con %1$s, página %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Canal de avisos con etiqueta %s (RSS 1.0)"
+msgstr "Canal de mensajes con etiqueta %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Canal de avisos con etiqueta %s (RSS 2.0)"
+msgstr "Canal de mensajes con etiqueta %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Canal de avisos con etiqueta %s (Atom)"
+msgstr "Canal de mensajes con etiqueta %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -4598,74 +4706,78 @@ msgstr ""
"sitio ‘%2$s’."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Usuario"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Configuración de usuarios en este sitio StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Límite para la bio inválido: Debe ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Límite de la bio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Longitud máxima de bio de perfil en caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nuevos usuarios"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Bienvenida a nuevos usuarios"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Suscripción predeterminada"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Suscribir automáticamente nuevos usuarios a este usuario."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitaciones"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invitaciones habilitadas"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Si permitir a los usuarios invitar nuevos usuarios."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar la suscripción"
@@ -4680,7 +4792,9 @@ msgstr ""
"avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
"haz clic en \"Cancelar\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licencia"
@@ -4879,6 +4993,15 @@ msgstr "Versión"
msgid "Author(s)"
msgstr "Autor(es)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Aceptar"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4936,6 +5059,17 @@ msgstr "No es parte del grupo."
msgid "Group leave failed."
msgstr "Ha fallado la acción de abandonar el grupo"
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4996,7 +5130,7 @@ msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
+"Demasiados mensajes demasiado rápido; para y publicar nuevamente en unos "
"minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
@@ -5017,21 +5151,21 @@ msgstr "Tienes prohibido publicar avisos en este sitio."
#. TRANS: Server exception thrown when a notice cannot be updated.
#: classes/Notice.php:358 classes/Notice.php:385
msgid "Problem saving notice."
-msgstr "Hubo un problema al guardar el aviso."
+msgstr "Hubo un problema al guardar el mensaje."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Mal tipo proveído a saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5057,7 +5191,7 @@ msgid "Missing profile."
msgstr "Perfil ausente."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Incapaz de grabar etiqueta."
@@ -5091,9 +5225,18 @@ msgstr "No se pudo eliminar la ficha OMB de suscripción."
msgid "Could not delete subscription."
msgstr "No se pudo eliminar la suscripción."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenido a %1$s, @%2$s!"
@@ -5285,7 +5428,7 @@ msgstr "Buscar"
#. TRANS: Menu item for site administration
#: lib/action.php:538 lib/adminpanelaction.php:387
msgid "Site notice"
-msgstr "Aviso de sitio"
+msgstr "Mensaje de sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:605
@@ -5295,7 +5438,7 @@ msgstr "Vistas locales"
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:675
msgid "Page notice"
-msgstr "Aviso de página"
+msgstr "Mensaje de página"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:778
@@ -5417,19 +5560,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Antes"
@@ -5532,13 +5675,18 @@ msgstr "Configuración de sesiones"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:385
msgid "Edit site notice"
-msgstr "Editar el aviso del sitio"
+msgstr "Editar el mensaje del sitio"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:393
msgid "Snapshots configuration"
msgstr "Configuración de instantáneas"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5549,33 +5697,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 hay ninguna aplicación para esa clave 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 "Token de acceso erróneo."
#. 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 hay ningún usuario para ese 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 "No ha sido posible autenticarte."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Se intentó revocar un token desconocido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "No se pudo eliminar el token revocado."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5624,38 +5772,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL al que se redirigirá después de la autenticación"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navegador"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Escritorio"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipo de aplicación, de navegador o de escritorio"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Solo lectura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Solo escritura"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancelar"
@@ -5734,20 +5882,20 @@ msgstr "Comando falló"
#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
#: lib/command.php:84 lib/command.php:108
msgid "Notice with that id does not exist."
-msgstr "Ningún aviso con ese ID existe."
+msgstr "No existe ningún mensaje con ese ID."
#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
#. TRANS: Error text shown when a last user notice is requested and it does not exist.
#: lib/command.php:101 lib/command.php:630
msgid "User has no last notice."
-msgstr "El/La usuario/a no tiene ningún último aviso"
+msgstr "El/La usuario/a no tiene ningún último mensaje"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
#: lib/command.php:130
#, php-format
msgid "Could not find a user with nickname %s."
-msgstr "No se pudo encontrar el usuario con el apodo %s."
+msgstr "No se pudo encontrar el usuario con el nombre de usuario %s."
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
@@ -5772,7 +5920,7 @@ msgstr "¡No tiene sentido darte un toque a ti mismo!"
#: lib/command.php:240
#, php-format
msgid "Nudge sent to %s."
-msgstr "Zumbido enviado a %s."
+msgstr "Toque enviado a %s."
#. TRANS: User statistics text.
#. TRANS: %1$s is the number of other user the user is subscribed to.
@@ -5792,7 +5940,7 @@ msgstr ""
#. TRANS: Text shown when a notice has been marked as favourite successfully.
#: lib/command.php:314
msgid "Notice marked as fave."
-msgstr "Aviso marcado como favorito."
+msgstr "Mensaje marcado como favorito."
#. 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.
@@ -5861,12 +6009,12 @@ msgstr "Error al enviar mensaje directo."
#: lib/command.php:554
#, php-format
msgid "Notice from %s repeated."
-msgstr "Se ha repetido el aviso de %s."
+msgstr "Se ha repetido el mensaje de %s."
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
#: lib/command.php:557
msgid "Error repeating notice."
-msgstr "Ha habido un error al repetir el aviso."
+msgstr "Ha habido un error al repetir el mensaje."
#. TRANS: Message given if content of a notice for a reply is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
@@ -5885,7 +6033,7 @@ msgstr "Se ha enviado la respuesta a %s."
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
#: lib/command.php:606
msgid "Error saving notice."
-msgstr "Error al guardar el aviso."
+msgstr "Error al guardar el mensaje."
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
#: lib/command.php:655
@@ -6146,15 +6294,11 @@ msgstr "Diseño predeterminado restaurado."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr "Sacar este aviso"
+msgstr "Excluir este mensaje de mis favoritos"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr "Incluir este aviso en tus favoritos"
-
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Aceptar"
+msgstr "Incluir este mensaje en tus favoritos"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -6173,8 +6317,8 @@ msgid "FOAF"
msgstr "Amistad de amistad"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar datos"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6235,7 +6379,7 @@ msgstr ""
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6243,13 +6387,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "Grupo %s"
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Miembros"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6257,13 +6401,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Miembros del grupo %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6271,7 +6415,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "%s usuarios bloqueados"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6279,13 +6423,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Editar las propiedades del grupo %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Logo"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6293,7 +6437,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Añadir o modificar el logo %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6301,20 +6445,20 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Añadir o modificar el diseño %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr "Grupos con más miembros"
+msgstr "Grupos con mayor cantidad de miembros"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr "Grupos con más publicaciones"
+msgstr "Grupos con mayor cantidad de publicaciones"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr "Etiquetas en avisos del grupo %s"
+msgstr "Etiquetas en mensajes del grupo %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
@@ -6369,10 +6513,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Origen de bandeja de entrada %d desconocido."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Unirse"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Abandonar"
@@ -6594,7 +6734,7 @@ msgstr ""
#: lib/mail.php:589
#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s (@%s) agregó tu aviso como un favorito"
+msgstr "%s (@%s) agregó tu mensaje a los favoritos"
#. TRANS: Body for favorite notification email
#: lib/mail.php:592
@@ -6617,13 +6757,13 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
-"%1$s (@%7$s) acaba de añadir un aviso de %2$s a su listado de favoritos.\n"
+"%1$s (@%7$s) acaba de añadir un mensaje de %2$s a su listado de favoritos.\n"
"\n"
-"El URL de tu aviso es:\n"
+"El URL de tu mensaje es:\n"
"\n"
"%3$s\n"
"\n"
-"El texto de tu aviso es:\n"
+"El texto de tu mensaje es:\n"
"\n"
"%4$s\n"
"\n"
@@ -6808,17 +6948,19 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" no es un tipo de archivo compatible en este servidor. Prueba a usar "
+"otro formato de %2$s"
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "\"%s\" no es un tipo de archivo compatible en este servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "Enviar un aviso directo"
+msgstr "Enviar un mensaje directo"
#: lib/messageform.php:146
msgid "To"
@@ -6835,7 +6977,7 @@ msgstr "Enviar"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "Enviar un aviso"
+msgstr "Enviar un mensaje"
#: lib/noticeform.php:174
#, php-format
@@ -6909,7 +7051,7 @@ msgstr "Repetido por"
#: lib/noticelist.php:630
msgid "Reply to this notice"
-msgstr "Responder este aviso."
+msgstr "Responder a este mensaje."
#: lib/noticelist.php:631
msgid "Reply"
@@ -6917,7 +7059,7 @@ msgstr "Responder"
#: lib/noticelist.php:675
msgid "Notice repeated"
-msgstr "Aviso repetido"
+msgstr "Mensaje repetido"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -6933,20 +7075,20 @@ msgstr "Dar un toque a este usuario"
#: lib/oauthstore.php:283
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Error al insertar un nuevo perfil."
#: lib/oauthstore.php:291
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Error al insertar el avatar."
#: lib/oauthstore.php:311
msgid "Error inserting remote profile."
-msgstr ""
+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
msgid "Duplicate notice."
-msgstr ""
+msgstr "Mensaje duplicado."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -6983,7 +7125,7 @@ msgstr "Mensajes enviados"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr "Etiquetas en avisos de %s"
+msgstr "Etiquetas en mensajes de %s"
#. TRANS: Displayed as version information for a plugin if no version information was found.
#: lib/plugin.php:116
@@ -7053,7 +7195,7 @@ msgstr "No hay respuesta a los argumentos."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr "Repetir este aviso?"
+msgstr "Repetir este mensaje?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -7061,14 +7203,14 @@ msgstr "Sí"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "Repetir este aviso."
+msgstr "Repetir este mensaje."
#: lib/revokeroleform.php:91
#, php-format
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar el rol \"%s\" de este usuario"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Ningún usuario sólo definido para modo monousuario."
@@ -7094,7 +7236,7 @@ msgstr "Palabra(s) clave"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Buscar"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -7111,7 +7253,7 @@ msgstr "Encontrar gente en este sitio"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr "Encontrar el contenido de avisos"
+msgstr "Buscar en el contenido de mensajes"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
@@ -7297,64 +7439,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "hace un año"
@@ -7367,3 +7509,17 @@ msgstr "¡%s no es un color válido!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 48982013c..728701eff 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:45+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:22+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -85,7 +85,7 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "ذخیره"
@@ -679,7 +679,7 @@ msgstr "یافت نشد."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "بیشینهٔ طول پیام %d نویسه که شامل نشانی اینترنتی پیوست هم هست."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "قالب پشتیبانی نشده."
@@ -877,9 +877,8 @@ msgid "Yes"
msgstr "بله"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "کاربر را مسدود کن"
@@ -1015,7 +1014,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "یک مشکل با رمز نشست شما وجود داشت."
@@ -1116,58 +1115,58 @@ msgid "Design"
msgstr "طرح"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "تنظیمات ظاهری برای این وب‌گاه StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "نشانی اینترنتی نشان نامعتبر است."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "پوسته در دسترس نیست: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "تغییر نشان"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "نشان وب‌گاه"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "تغییر پوسته"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "پوستهٔ وب‌گاه"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "پوسته برای وب‌گاه"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "پوستهٔ اختصاصی"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"شما می‌توانید یک پوستهٔ اختصاصی StatusNet را به‌عنوان یک آرشیو .ZIP بارگذاری "
"کنید."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "تغییر تصویر پیش‌زمینه"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "پیش‌زمینه"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1177,75 +1176,76 @@ msgstr ""
"پرونده %1 $s است."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "روشن"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "خاموش"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "تصویر پیش‌زمینه را فعال یا غیرفعال کنید."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "تصویر پیش‌زمینهٔ موزاییکی"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "تغییر رنگ‌ها"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "محتوا"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "ستون کناری"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "متن"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "پیوندها"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "پیشرفته"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS اختصاصی"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "استفاده‌کردن از پیش‌فرض‌ها"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "بازگرداندن طرح‌های پیش‌فرض"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "برگشت به حالت پیش گزیده"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "ذخیره‌کردن"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "ذخیره‌کردن طرح"
@@ -1315,7 +1315,7 @@ msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ ن
msgid "Organization homepage is required."
msgstr "صفحهٔ‌خانگی سازمان مورد نیاز است."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "نمی‌توان برنامه را به‌هنگام‌سازی کرد."
@@ -1408,7 +1408,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "انصراف"
@@ -1875,6 +1875,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "کاربر یک مدیر گروه شود"
@@ -2316,6 +2322,110 @@ msgstr "شما یک کاربر این گروه نیستید."
msgid "%1$s left group %2$s"
msgstr "%1$s گروه %2$s را ترک کرد"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "قبلا وارد شده"
@@ -2550,8 +2660,8 @@ msgid "Connected applications"
msgstr "برنامه‌های وصل‌شده"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "شما به برنامه‌های زیر اجازه داده‌اید که به حساب‌تان دسترسی پیدا کنند."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2575,7 +2685,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "این پیام نمایه‌ای ندارد."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "وضعیت %1$s در %2$s"
@@ -2741,8 +2851,8 @@ msgid "Paths"
msgstr "مسیر ها"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "تنظیمات و نشانی محلی این وب‌گاه StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3581,8 +3691,8 @@ msgid "Sessions"
msgstr "نشست‌ها"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "تنظیمات نشست برای این وب‌گاه StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3597,7 +3707,6 @@ msgid "Turn on debugging output for sessions."
msgstr "خروجی اشکال‌زدایی برای نشست‌ها روشن شود."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "ذخیرهٔ تنظیمات وب‌گاه"
@@ -4488,74 +4597,78 @@ msgid "Unsubscribed"
msgstr "لغو اشتراک شده"
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "کاربر"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "تنظیمات کاربری برای این وب‌گاه StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "محدودیت شرح‌حال نادرست است. مقدار محدودیت باید عددی باشد."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر نیست."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "نمایه"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "محدودیت شرح‌حال"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "بیشینهٔ طول یک شرح‌حال نمایه بر اساس نویسه‌ها."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "کاربران تازه"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "خوشامدگویی کاربر جدید"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "متن خوشامدگویی برای کاربران جدید (حداکثر ۲۵۵ نویسه)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "اشتراک پیش‌فرض"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "به صورت خودکار کاربران تازه‌وارد را مشترک این کاربر کن."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "دعوت‌نامه‌ها"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "دعوت نامه ها فعال شدند"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "تصدیق اشتراک"
@@ -4570,7 +4683,9 @@ msgstr ""
"شوید، بررسی کنید. اگر شما درخواست اشتراک پیام‌های کسی را نداده‌اید، روی «رد "
"کردن» کلیک کنید."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "مجوز"
@@ -4747,6 +4862,15 @@ msgstr "نسخه"
msgid "Author(s)"
msgstr "مؤلف(ها)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "برگزیده‌کردن"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4795,6 +4919,17 @@ msgstr "بخشی از گروه نیست."
msgid "Group leave failed."
msgstr "ترک کردن گروه شکست خورد."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "مشارکت کردن"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4874,18 +5009,18 @@ msgid "Problem saving notice."
msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ داد."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4945,9 +5080,18 @@ msgstr "نمی‌توان اشتراک را ذخیره کرد."
msgid "Could not delete subscription."
msgstr "نمی‌توان اشتراک را ذخیره کرد."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s، به %1$s خوش آمدید!"
@@ -5261,19 +5405,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "قبل از"
@@ -5382,6 +5526,11 @@ msgstr "ویرایش پیام وب‌گاه"
msgid "Snapshots configuration"
msgstr "پیکربندی تصاویر لحظه‌ای"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5467,37 +5616,37 @@ msgid "URL to redirect to after authentication"
msgstr "نشانی اینترنتی برای دوباره‌هدایت‌کردن بعد از تصدیق"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "مرورگر"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "میزکار"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "نوع برنامه، مرورگر یا میزکار"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "تنها خواندنی"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "خواندن-نوشتن"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr "دسترسی پیش‌فرض برای این برنامه: تنها خواندنی یا خواندن-نوشتن"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "انصراف"
@@ -5983,10 +6132,6 @@ msgstr "خارج‌کردن این پیام از برگزیده‌ها"
msgid "Favor this notice"
msgstr "برگزیده‌کردن این پیام"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "برگزیده‌کردن"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -6000,8 +6145,8 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "صادر کردن داده"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6189,10 +6334,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "منبع صندوق ورودی نامعلوم است %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "مشارکت کردن"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "ترک کردن"
@@ -6870,7 +7011,7 @@ msgstr "تکرار این پیام"
msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر به گروه مسدود شود"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
@@ -7067,60 +7208,60 @@ msgid "Moderator"
msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "حدود یک سال پیش"
@@ -7133,3 +7274,17 @@ msgstr "%s یک رنگ صحیح نیست!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده استفاده کنید"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index b67a82c9a..aa39e244a 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:42+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:22+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -52,7 +52,7 @@ msgstr "Suljettu"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Tallenna"
@@ -564,7 +564,7 @@ msgstr "Ei löytynyt."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formaattia ei ole tuettu."
@@ -726,9 +726,8 @@ msgid "Do not block this user"
msgstr "Älä estä tätä käyttäjää"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Estä tämä käyttäjä"
@@ -843,7 +842,7 @@ msgstr "Vahvistuskoodia ei löytynyt."
#. 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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -925,76 +924,77 @@ msgid "Design"
msgstr "Ulkoasu"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Palvelun ilmoitus"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Vaihda tautakuva"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tausta"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Vaihda väriä"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Sisältö"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Teksti"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Linkit"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Käytä oletusasetuksia"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Tallenna"
@@ -1498,6 +1498,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Tee tästä käyttäjästä ylläpitäjä"
@@ -1902,6 +1908,110 @@ msgstr "Sinä et kuulu tähän ryhmään."
msgid "%1$s left group %2$s"
msgstr "Käyttäjän %1$s päivitys %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Olet jo kirjautunut sisään."
@@ -2061,7 +2171,7 @@ msgid "Connected applications"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -2081,7 +2191,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Käyttäjällä ei ole profiilia."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Käyttäjän %1$s päivitys %2$s"
@@ -2218,8 +2328,8 @@ msgid "Paths"
msgstr "Polut"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2840,6 +2950,10 @@ msgstr "Päivityksesi tähän palveluun on estetty."
msgid "Sessions"
msgstr ""
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site"
+msgstr ""
+
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
msgstr ""
@@ -3565,50 +3679,60 @@ msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiili"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Valtuuta tilaus"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Lisenssi"
@@ -3745,6 +3869,15 @@ msgstr ""
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Lisää suosikiksi"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3779,6 +3912,17 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Liity"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3841,13 +3985,13 @@ msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3867,7 +4011,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Tagien tallennus epäonnistui."
@@ -3891,6 +4035,15 @@ msgstr "Tilausta ei onnistuttu tallentamaan."
msgid "Could not delete subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Server exception thrown when creating a group failed.
#: classes/User_group.php:496
msgid "Could not create group."
@@ -4102,19 +4255,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Aiemmin"
@@ -4143,6 +4296,11 @@ msgstr ""
msgid "User"
msgstr "Käyttäjä"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4211,37 +4369,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Peruuta"
@@ -4527,10 +4685,6 @@ msgstr "Poista tämä päivitys suosikeista"
msgid "Favor this notice"
msgstr "Merkitse päivitys suosikkeihin"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Lisää suosikiksi"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -4548,8 +4702,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Vie tietoja"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4730,10 +4884,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Liity"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Eroa"
@@ -5263,7 +5413,7 @@ msgstr "Suosituimmat"
msgid "Yes"
msgstr "Kyllä"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5430,17 +5580,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5448,12 +5598,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5461,12 +5611,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5474,12 +5624,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5487,7 +5637,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "noin vuosi sitten"
@@ -5495,3 +5645,17 @@ msgstr "noin vuosi sitten"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index ccd133acd..f4cb8829c 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -11,6 +11,7 @@
# Author: Patcito
# Author: Peter17
# Author: Sherbrooke
+# Author: Verdy p
# Author: Y-M D
# --
# This file is distributed under the same license as the StatusNet package.
@@ -19,17 +20,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:50+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:23+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -89,7 +90,7 @@ msgstr "Sauvegarder les paramètres d’accès"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Enregistrer"
@@ -711,7 +712,7 @@ msgstr ""
"La taille maximale de l’avis est de %d caractères, en incluant l’URL de la "
"pièce jointe."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Format non supporté."
@@ -908,9 +909,8 @@ msgid "Yes"
msgstr "Oui"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloquer cet utilisateur"
@@ -1046,7 +1046,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1147,57 +1147,57 @@ msgid "Design"
msgstr "Conception"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Paramètres de conception pour ce site StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL du logo invalide."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Le thème n’est pas disponible : %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Modifier le logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo du site"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Modifier le thème"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Thème du site"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Thème pour le site."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Thème personnalisé"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Changer l’image d’arrière plan"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Arrière plan"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1207,75 +1207,76 @@ msgstr ""
"maximale du fichier est de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Activé"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Désactivé"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 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:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Répéter l’image d’arrière plan"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifier les couleurs"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contenu"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barre latérale"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texte"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Liens"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avancé"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personnalisé"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utiliser les valeurs par défaut"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurer les conceptions par défaut"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir aux valeurs par défaut"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Enregistrer"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Sauvegarder la conception"
@@ -1353,7 +1354,7 @@ msgstr "Le rappel (Callback) est trop long."
msgid "Callback URL is not valid."
msgstr "L’URL de rappel (Callback) est invalide."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Impossible de mettre à jour l’application."
@@ -1446,7 +1447,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annuler"
@@ -1915,6 +1916,12 @@ msgstr "Administrer"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Bloquer"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1925,13 +1932,13 @@ msgstr "Faire de cet utilisateur un administrateur du groupe"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Rendre administrateur"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Faire de cet utilisateur un administrateur"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -2372,6 +2379,110 @@ msgstr "Vous n’êtes pas membre de ce groupe."
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Déjà connecté."
@@ -2616,9 +2727,8 @@ msgid "Connected applications"
msgstr "Applications connectées."
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
-"Vous avez autorisé les applications suivantes à accéder à votre compte."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2643,7 +2753,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "L’avis n’a pas de profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Statut de %1$s sur %2$s"
@@ -2808,8 +2918,8 @@ msgid "Paths"
msgstr "Chemins"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Paramètres de chemin et serveur pour ce site StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3381,11 +3491,11 @@ msgstr "Créer un compte"
#: actions/register.php:142
msgid "Registration not allowed."
-msgstr "Création de compte non autorisée."
+msgstr "Inscription non autorisée."
#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
-msgstr "Vous devez accepter les termes de la licence pour créer un compte."
+msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
#: actions/register.php:219
msgid "Email address already exists."
@@ -3678,8 +3788,8 @@ msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Paramètres de session pour ce site StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3698,7 +3808,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Activer la sortie de déboguage pour les sessions."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Sauvegarder les paramètres du site"
@@ -4627,76 +4736,80 @@ msgstr ""
"avec la licence du site « %2$s »."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Utilisateur"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Paramètres des utilisateurs pour ce site StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite de bio invalide : doit être numérique."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limite de bio"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Longueur maximale de la bio d’un profil en caractères."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nouveaux utilisateurs"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Accueil des nouveaux utilisateurs"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
"Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Abonnements par défaut"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitations"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invitations activées"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
"S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser l’abonnement"
@@ -4711,7 +4824,9 @@ msgstr ""
"abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
"abonner aux avis de quelqu’un, cliquez « Rejeter »."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licence"
@@ -4913,6 +5028,15 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Auteur(s)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Ajouter à mes favoris"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4969,6 +5093,17 @@ msgstr "N’appartient pas au groupe."
msgid "Group leave failed."
msgstr "La désinscription du groupe a échoué."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Rejoindre"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5053,18 +5188,18 @@ msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Le type renseigné pour saveKnownGroups n’est pas valable"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5093,7 +5228,7 @@ msgid "Missing profile."
msgstr "Profil manquant."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Impossible d’enregistrer l’étiquette."
@@ -5132,9 +5267,18 @@ msgstr "Impossible de supprimer le jeton OMB de l'abonnement."
msgid "Could not delete subscription."
msgstr "Impossible de supprimer l’abonnement"
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenue à %1$s, @%2$s !"
@@ -5237,7 +5381,7 @@ 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:468
msgid "Connect"
-msgstr "Connecter"
+msgstr "Connexion"
#. TRANS: Tooltip for menu option "Admin"
#: lib/action.php:471
@@ -5287,7 +5431,7 @@ msgstr "Créer un compte"
#: lib/action.php:498
msgctxt "MENU"
msgid "Register"
-msgstr "S'inscrire"
+msgstr "S’inscrire"
#. TRANS: Tooltip for main menu option "Login"
#: lib/action.php:501
@@ -5458,19 +5602,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Avant"
@@ -5578,6 +5722,11 @@ msgstr "Modifier l'avis du site"
msgid "Snapshots configuration"
msgstr "Configuration des instantanés"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5588,33 +5737,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 "Aucune demande trouvée pour cette clé de consommateur."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Jeton d’accès erroné."
#. 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 "Aucun utilisateur associé à ce jeton."
#. 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 "Impossible de vous authentifier."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+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:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Impossible de supprimer un jeton révoqué."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5663,39 +5812,39 @@ msgid "URL to redirect to after authentication"
msgstr "URL vers laquelle rediriger après l’authentification"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navigateur"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Bureau"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Type d’application, navigateur ou bureau"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Lecture seule"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lecture-écriture"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accès par défaut pour cette application : en lecture seule ou en lecture-"
"écriture"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Annuler"
@@ -6198,10 +6347,6 @@ msgstr "Retirer des favoris"
msgid "Favor this notice"
msgstr "Ajouter aux favoris"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Ajouter à mes favoris"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6219,8 +6364,8 @@ msgid "FOAF"
msgstr "Ami d’un ami"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exporter les données"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6282,7 +6427,7 @@ msgstr ""
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Groupe"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6290,13 +6435,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "Groupe « %s »"
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Membres"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6304,13 +6449,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Membres du groupe « %s »"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Bloqué"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6318,7 +6463,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "Utilisateurs bloqués du groupe « %s »"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6326,13 +6471,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Modifier les propriétés du groupe « %s »"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Logo"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6340,7 +6485,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Ajouter ou modifier le logo du groupe « %s »"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6348,7 +6493,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Ajouter ou modifier l’apparence du groupe « %s »"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6417,10 +6562,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Source %d inconnue pour la boîte de réception."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Rejoindre"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Quitter"
@@ -6855,13 +6996,15 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"Le type de fichier « %1$s » n’est pas pris en charge sur ce serveur. Essayez "
+"d’utiliser un autre format %2$s."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "« %s » n’est pas un type de fichier supporté sur ce serveur."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6895,7 +7038,7 @@ msgstr "Attacher"
#: lib/noticeform.php:197
msgid "Attach a file"
-msgstr "Attacher un fichier"
+msgstr "Joindre un fichier"
#: lib/noticeform.php:213
msgid "Share my location"
@@ -6980,20 +7123,20 @@ msgstr "Envoyer un clin d’œil à cet utilisateur"
#: lib/oauthstore.php:283
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Erreur lors de l’insertion du nouveau profil."
#: lib/oauthstore.php:291
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Erreur lors de l’insertion de l’avatar."
#: lib/oauthstore.php:311
msgid "Error inserting remote profile."
-msgstr ""
+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
msgid "Duplicate notice."
-msgstr ""
+msgstr "Avis en doublon."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -7115,7 +7258,7 @@ msgstr "Reprendre cet avis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
@@ -7141,7 +7284,7 @@ msgstr "Mot(s) clef(s)"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Rechercher"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -7347,64 +7490,64 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "un"
+msgstr[1] "%d"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -7418,3 +7561,17 @@ msgstr "&s n’est pas une couleur valide !"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index b306b5ef0..48edc0c3a 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:52+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:24+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
@@ -718,88 +718,89 @@ msgid "Design"
msgstr ""
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Modificado"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr ""
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Inicio de sesión"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1212,6 +1213,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr ""
@@ -1580,6 +1587,110 @@ msgstr ""
msgid "%1$s left group %2$s"
msgstr "Estado de %1$s en %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sesión xa iniciada"
@@ -1739,7 +1850,7 @@ msgid "Connected applications"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -1759,7 +1870,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "O usuario non ten perfil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
@@ -1889,7 +2000,7 @@ msgid "Paths"
msgstr ""
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:183
@@ -2493,7 +2604,7 @@ msgid "Sessions"
msgstr ""
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:175
@@ -2513,7 +2624,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Configuración de perfil"
@@ -3150,54 +3260,60 @@ msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Subscrición de autorización."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr ""
@@ -3323,6 +3439,15 @@ msgstr ""
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Gostame"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3357,6 +3482,13 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3410,13 +3542,13 @@ msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3436,7 +3568,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Non se poden gardar as etiquetas."
@@ -3460,6 +3592,15 @@ msgstr "Non se pode gardar a subscrición."
msgid "Could not delete subscription."
msgstr "Non se pode gardar a subscrición."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a group URI failed.
#: classes/User_group.php:506
msgid "Could not set group URI."
@@ -3633,13 +3774,13 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
msgid "After"
msgstr "Outros"
@@ -3673,6 +3814,11 @@ msgstr "Usuario"
msgid "Edit site notice"
msgstr "Eliminar chío"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -3730,37 +3876,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancelar"
@@ -4057,10 +4203,6 @@ msgstr "Chíos favoritos de %s"
msgid "Favor this notice"
msgstr "Chíos favoritos de %s"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Gostame"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -4078,7 +4220,7 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
+msgid "Feeds"
msgstr ""
#: lib/galleryaction.php:121
@@ -4707,7 +4849,7 @@ msgstr "Si"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -4840,17 +4982,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -4861,12 +5003,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -4877,12 +5019,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -4893,12 +5035,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -4909,7 +5051,7 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "fai un ano"
@@ -4922,3 +5064,17 @@ msgstr "A páxina persoal semella que non é unha URL válida."
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index e2322622e..0f299e6ac 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
# Translation of StatusNet - Core to Galician (Galego)
# Expored from translatewiki.net
#
+# Author: Brion
# Author: Gallaecio
# Author: Toliño
# --
@@ -10,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:54+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:25+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -80,7 +81,7 @@ msgstr "Gardar a configuración de acceso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Gardar"
@@ -696,7 +697,7 @@ msgstr ""
"A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato "
"adxunto."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato non soportado."
@@ -893,9 +894,8 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloquear este usuario"
@@ -1031,7 +1031,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Houbo un problema co seu pase."
@@ -1132,57 +1132,57 @@ msgid "Design"
msgstr "Deseño"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Configuración do deseño deste sitio StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL do logo incorrecto."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "O tema visual non está dispoñible: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Cambiar o logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo do sitio"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Cambar o tema visual"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema visual do sitio"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema visual para o sitio."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Tema visual personalizado"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar a imaxe de fondo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fondo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1192,75 +1192,76 @@ msgstr ""
"ficheiro é de %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Activado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Desactivado"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar ou desactivar a imaxe de fondo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Imaxe de fondo en mosaico"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar as cores"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contido"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Ligazóns"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avanzado"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Utilizar os valores por defecto"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar o deseño por defecto"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Volver ao deseño por defecto"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Gardar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Gardar o deseño"
@@ -1338,7 +1339,7 @@ msgstr "O retorno de chamada é longo de máis."
msgid "Callback URL is not valid."
msgstr "O URL do retorno de chamada é incorrecto."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Non se puido actualizar a aplicación."
@@ -1431,7 +1432,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1905,6 +1906,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Bloquear"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Converter ao usuario en administrador do grupo"
@@ -2350,6 +2357,110 @@ msgstr "Non pertence a ese grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Xa se identificou."
@@ -2590,8 +2701,8 @@ msgid "Connected applications"
msgstr "Aplicacións conectadas"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2616,7 +2727,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Non hai perfil para a nota."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s en %2$s"
@@ -2783,8 +2894,8 @@ msgid "Paths"
msgstr "Rutas"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Configuración do servidor e das rutas para este sitio StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3653,8 +3764,8 @@ msgid "Sessions"
msgstr "Sesións"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Configuración da sesión para este sitio StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3673,7 +3784,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Activar a saída de depuración para as sesións."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Gardar a configuración do sitio"
@@ -4598,74 +4708,78 @@ msgstr ""
"licenza deste sitio: \"%2$s\"."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Usuario"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Preferencias de usuario para este sitio StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Límite da biografía incorrecto. Debe ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Límite da biografía"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Extensión máxima da biografía dun perfil en caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Novos usuarios"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Nova benvida para os usuarios"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Subscrición por defecto"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Subscribir automaticamente aos novos usuarios a este usuario."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitacións"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Activáronse as invitacións"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar a subscrición"
@@ -4680,7 +4794,9 @@ msgstr ""
"deste usuario. Se non pediu a subscrición ás notas de alguén, prema en "
"\"Rexeitar\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licenza"
@@ -4879,6 +4995,15 @@ msgstr "Versión"
msgid "Author(s)"
msgstr "Autores"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Marcar como favorito"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4936,6 +5061,17 @@ msgstr "Non forma parte do grupo."
msgid "Group leave failed."
msgstr "Non se puido deixar o grupo."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5020,21 +5156,21 @@ msgid "Problem saving notice."
msgstr "Houbo un problema ao gardar a nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "O tipo dado para saveKnownGroups era incorrecto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
-msgstr "♻ @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5058,7 +5194,7 @@ msgid "Missing profile."
msgstr "Falta o perfil de usuario."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Non se puido gardar a nota do sitio."
@@ -5097,9 +5233,18 @@ msgstr "Non se puido borrar o pase de subscrición OMB."
msgid "Could not delete subscription."
msgstr "Non se puido borrar a subscrición."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvido a %1$s, @%2$s!"
@@ -5423,19 +5568,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Anteriores"
@@ -5544,6 +5689,11 @@ msgstr "Modificar a nota do sitio"
msgid "Snapshots configuration"
msgstr "Configuración das instantáneas"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5554,33 +5704,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 "Non hai ningunha aplicación para esa clave."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Pase de acceso incorrecto."
#. 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 "Non hai ningún usuario para ese pase."
#. 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 "Non puidemos autenticalo."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Intentouse revogar un pase descoñecido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Erro ao borrar o pase revogado."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5629,38 +5779,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL ao que ir tras a autenticación"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navegador"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Escritorio"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipo de aplicación, de navegador ou de escritorio"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Lectura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lectura e escritura"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancelar"
@@ -6157,10 +6307,6 @@ msgstr "Desmarcar esta nota como favorita"
msgid "Favor this notice"
msgstr "Marcar esta nota como favorita"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Marcar como favorito"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6178,8 +6324,8 @@ msgid "FOAF"
msgstr "Amigo dun amigo"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar os datos"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6375,10 +6521,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Non se coñece a fonte %d da caixa de entrada."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Unirse"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Deixar"
@@ -6810,6 +6952,8 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" non é un tipo de ficheiro soportado neste servidor. Intente usar "
+"outro formato de %2$s."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
@@ -7070,7 +7214,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revogarlle o rol \"%s\" a este usuario"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
@@ -7300,64 +7444,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "hai como un ano"
@@ -7370,3 +7514,17 @@ msgstr "%s non é unha cor correcta!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 05bd870d6..019a63909 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:57+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:25+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Přistupne nastajenja składować"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Składować"
@@ -657,7 +657,7 @@ msgstr "Njenamakany."
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Njepodpěrany format."
@@ -831,9 +831,8 @@ msgid "Yes"
msgstr "Haj"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Tutoho wužiwarja blokować"
@@ -961,7 +960,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -1055,56 +1054,56 @@ msgid "Design"
msgstr "Design"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Designowe nastajenja za tute sydło StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Njepłaćiwy logowy URL."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Šat njesteji k dispoziciji: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Logo změnić"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo sydła"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Šat změnić"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Šat sydła"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Šat za sydło."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Swójski šat"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Pozadkowy wobraz změnić"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Pozadk"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1113,67 +1112,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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Zapinjeny"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Wupinjeny"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Barby změnić"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Wobsah"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Bóčnica"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Wotkazy"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Rozšěrjeny"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Swójski CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standardne hódnoty wužiwać"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standardne designy wobnowić"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Na standard wróćo stajić"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Składować"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Design składować"
@@ -1243,7 +1243,7 @@ msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
msgid "Organization homepage is required."
msgstr "Startowa strona organizacije je trěbna."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Aplikacija njeda so aktualizować."
@@ -1334,7 +1334,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -1756,6 +1756,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Wužiwarja k administratorej skupiny činić"
@@ -2136,6 +2142,110 @@ msgstr "Njejsy čłon teje skupiny."
msgid "%1$s left group %2$s"
msgstr "%1$s je skupinu %2$s wopušćił"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Hižo přizjewjeny."
@@ -2349,7 +2459,7 @@ msgid "Connected applications"
msgstr "Zwjazane aplikacije"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:175
@@ -2512,8 +2622,8 @@ msgid "Paths"
msgstr "Šćežki"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3218,8 +3328,8 @@ msgid "Sessions"
msgstr "Posedźenja"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Nastajenja posedźenja za tute sydło StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3238,7 +3348,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Sydłowe nastajenja składować"
@@ -3930,66 +4039,70 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Wužiwar"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Wužiwarske nastajenja za sydło StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nowi wužiwarjo"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Powitanje noweho wužiwarja"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Standardny abonement"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Přeprošenja"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Přeprošenja zmóžnjene"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonement awtorizować"
@@ -4001,7 +4114,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licenca"
@@ -4156,6 +4271,11 @@ msgstr "Wersija"
msgid "Author(s)"
msgstr "Awtorojo"
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4210,6 +4330,17 @@ msgstr "Njeje dźěl skupiny."
msgid "Group leave failed."
msgstr "Wopušćenje skupiny je so njeporadźiło."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Zastupić"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4259,18 +4390,18 @@ msgid ""
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4295,7 +4426,7 @@ msgid "Missing profile."
msgstr "Falowacy profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Njeje móžno, tafličku składować."
@@ -4329,9 +4460,18 @@ msgstr "Znamjo OMB-abonementa njeda so zhašeć."
msgid "Could not delete subscription."
msgstr "Abonoment njeda so zhašeć ."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj do %1$s, @%2$s!"
@@ -4610,13 +4750,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Před"
@@ -4708,6 +4848,11 @@ msgstr "Sydłowu zdźělenku wobdźěłać"
msgid "Snapshots configuration"
msgstr "Konfiguracija wobrazowkowych fotow"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4786,37 +4931,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Wobhladowak"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Jenož čitajomny"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Popisujomny"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -5270,8 +5415,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Daty eksportować"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5458,10 +5603,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Njeznate žórło postoweho kašćika %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Zastupić"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Wopušćić"
@@ -6021,7 +6162,7 @@ msgstr "Tutu zdźělenku wospjetować"
msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
@@ -6216,17 +6357,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6236,12 +6377,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6251,12 +6392,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6266,12 +6407,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6281,7 +6422,7 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -6296,3 +6437,17 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
"heksadecimalnych znamješkow."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index aa3e0c055..8b0a65419 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:58+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:27+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ msgstr "Salveguardar configurationes de accesso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Salveguardar"
@@ -113,7 +113,7 @@ msgstr "Pagina non existe."
#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "Usator non existe."
+msgstr "Iste usator non existe."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:90
@@ -693,7 +693,7 @@ msgstr ""
"Le longitude maximal del notas es %d characteres, includente le URL "
"adjungite."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato non supportate."
@@ -890,9 +890,8 @@ msgid "Yes"
msgstr "Si"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blocar iste usator"
@@ -1028,7 +1027,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1129,58 +1128,58 @@ msgid "Design"
msgstr "Apparentia"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Configuration del apparentia de iste sito StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL de logotypo invalide."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Thema non disponibile: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Cambiar logotypo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotypo del sito"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Cambiar thema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Thema del sito"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Le thema de apparentia pro le sito."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Apparentia personalisate"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Cambiar imagine de fundo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1190,75 +1189,76 @@ msgstr ""
"file es %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Active"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Non active"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Activar o disactivar le imagine de fundo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Tegular le imagine de fundo"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Cambiar colores"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contento"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Ligamines"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avantiate"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalisate"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinitiones"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaurar apparentias predefinite"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Revenir al predefinitiones"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Salveguardar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Salveguardar apparentia"
@@ -1330,13 +1330,13 @@ msgstr "Le sito web del organisation es requirite."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
-msgstr "Le reappello (callback) es troppo longe."
+msgstr "Le appello de retorno es troppo longe."
#: actions/editapplication.php:225 actions/newapplication.php:215
msgid "Callback URL is not valid."
-msgstr "Le URL de reappello (callback) non es valide."
+msgstr "Le URL de retorno non es valide."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Non poteva actualisar application."
@@ -1429,7 +1429,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancellar"
@@ -1898,6 +1898,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Blocar"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Facer le usator administrator del gruppo"
@@ -2198,7 +2204,7 @@ msgstr "Invitar nove usatores"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr "Tu es a subscribite a iste usatores:"
+msgstr "Tu es ja subscribite a iste usatores:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2345,6 +2351,110 @@ msgstr "Tu non es membro de iste gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s quitava le gruppo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Tu es jam authenticate."
@@ -2585,8 +2695,8 @@ msgid "Connected applications"
msgstr "Applicationes connectite"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Tu ha permittite al sequente applicationes de acceder a tu conto."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2611,7 +2721,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Le nota ha nulle profilo."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Le stato de %1$s in %2$s"
@@ -2776,8 +2886,8 @@ msgid "Paths"
msgstr "Camminos"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Configuration de cammino e servitor pro iste sito StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3342,7 +3452,7 @@ msgstr "Crear conto"
#: actions/register.php:142
msgid "Registration not allowed."
-msgstr "Registration non permittite."
+msgstr "Creation de conto non permittite."
#: actions/register.php:205
msgid "You can't register if you don't agree to the license."
@@ -3633,8 +3743,8 @@ msgid "Sessions"
msgstr "Sessiones"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Parametros de session pro iste sito StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3653,7 +3763,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Producer informationes technic pro cercar defectos in sessiones."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Salveguardar configurationes del sito"
@@ -4573,74 +4682,78 @@ msgstr ""
"licentia del sito ‘%2$s’."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Usator"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Configurationes de usator pro iste sito de StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite de biographia invalide. Debe esser un numero."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texto de benvenita invalide. Longitude maximal es 255 characteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Subscription predefinite invalide: '%1$s' non es usator."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profilo"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limite de biographia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Le longitude maximal del biographia de un profilo in characteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nove usatores"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Message de benvenita a nove usatores"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de benvenita pro nove usatores (max. 255 characteres)"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Subscription predefinite"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Subscriber automaticamente le nove usatores a iste usator."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitationes"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invitationes activate"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Si le usatores pote invitar nove usatores."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorisar subscription"
@@ -4654,7 +4767,9 @@ msgstr ""
"Per favor verifica iste detalios pro assecurar te que tu vole subscriber te "
"al notas de iste usator. Si tu non ha requestate isto, clicca \"Rejectar\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licentia"
@@ -4854,6 +4969,15 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Autor(es)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Favorir"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4910,6 +5034,17 @@ msgstr "Non es membro del gruppo."
msgid "Group leave failed."
msgstr "Le cancellation del membrato del gruppo ha fallite."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Inscriber"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4994,18 +5129,18 @@ msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Mal typo fornite a saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5032,7 +5167,7 @@ msgid "Missing profile."
msgstr "Profilo mancante."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Impossibile salveguardar le etiquetta."
@@ -5071,9 +5206,18 @@ msgstr "Non poteva deler le indicio OMB del subscription."
msgid "Could not delete subscription."
msgstr "Non poteva deler subscription."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenite a %1$s, @%2$s!"
@@ -5393,19 +5537,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Ante"
@@ -5515,6 +5659,11 @@ msgstr "Modificar aviso del sito"
msgid "Snapshots configuration"
msgstr "Configuration del instantaneos"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5600,39 +5749,39 @@ msgid "URL to redirect to after authentication"
msgstr "URL verso le qual rediriger post authentication"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navigator"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Scriptorio"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Typo de application, navigator o scriptorio"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Lectura solmente"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lectura e scriptura"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accesso predefinite pro iste application: lectura solmente, o lectura e "
"scriptura"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancellar"
@@ -6128,10 +6277,6 @@ msgstr "Disfavorir iste nota"
msgid "Favor this notice"
msgstr "Favorir iste nota"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Favorir"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6149,8 +6294,8 @@ msgid "FOAF"
msgstr "Amico de un amico"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar datos"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6344,10 +6489,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Fonte de cassa de entrata \"%s\" incognite"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Inscriber"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Quitar"
@@ -7041,7 +7182,7 @@ msgstr "Repeter iste nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Nulle signule usator definite pro le modo de singule usator."
@@ -7273,17 +7414,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7291,12 +7432,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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7304,12 +7445,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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7317,12 +7458,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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7330,7 +7471,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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "circa un anno retro"
@@ -7343,3 +7484,17 @@ msgstr "%s non es un color valide!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index d9819ca59..7bebb8e92 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:00+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:27+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -610,9 +610,8 @@ msgid "No"
msgstr "Athugasemd"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Loka á þennan notanda"
@@ -716,7 +715,7 @@ msgstr "Staðfestingarlykill fannst ekki."
#. 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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -779,80 +778,81 @@ msgid "Design"
msgstr ""
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Babl vefsíðunnar"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texti"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Vista"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1269,6 +1269,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr ""
@@ -1653,6 +1659,110 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
msgid "%1$s left group %2$s"
msgstr "Staða %1$s á %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Þú hefur nú þegar skráð þig inn."
@@ -1811,7 +1921,7 @@ msgid "Connected applications"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -1831,7 +1941,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Notandi hefur enga persónulega síðu."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Staða %1$s á %2$s"
@@ -1972,7 +2082,7 @@ msgid "Paths"
msgstr ""
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:183
@@ -2618,7 +2728,7 @@ msgid "Sessions"
msgstr ""
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:175
@@ -3320,54 +3430,60 @@ msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Persónuleg síða"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Heimila áskriftir"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr ""
@@ -3499,6 +3615,15 @@ msgstr ""
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Uppáhald"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3533,6 +3658,17 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Gerast meðlimur"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3586,13 +3722,13 @@ msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3612,7 +3748,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Gat ekki vistað merki."
@@ -3636,6 +3772,15 @@ msgstr "Gat ekki vistað áskrift."
msgid "Could not delete subscription."
msgstr "Gat ekki vistað áskrift."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Server exception thrown when creating a group failed.
#: classes/User_group.php:496
msgid "Could not create group."
@@ -3835,19 +3980,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Áður"
@@ -3882,6 +4027,11 @@ msgstr ""
msgid "User"
msgstr "Notandi"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -3944,37 +4094,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Hætta við"
@@ -4298,10 +4448,6 @@ msgstr "Taka þetta babl út sem uppáhald"
msgid "Favor this notice"
msgstr "Setja þetta babl í uppáhald"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Uppáhald"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -4319,8 +4465,8 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Flytja út gögn"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4495,10 +4641,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Gerast meðlimur"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Hætta sem meðlimur"
@@ -5017,7 +5159,7 @@ msgstr "Já"
msgid "Revoke the \"%s\" role from this user"
msgstr ""
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5189,17 +5331,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5207,12 +5349,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5220,12 +5362,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5233,12 +5375,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5246,7 +5388,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
@@ -5254,3 +5396,17 @@ msgstr "fyrir um einu ári síðan"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 505f6abaf..537d70135 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:01+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:28+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ msgstr "Salva impostazioni di accesso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Salva"
@@ -685,7 +685,7 @@ msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
"La dimensione massima di un messaggio è di %d caratteri, compreso l'URL."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato non supportato."
@@ -881,9 +881,8 @@ msgid "Yes"
msgstr "Sì"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blocca questo utente"
@@ -1019,7 +1018,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1119,56 +1118,56 @@ msgid "Design"
msgstr "Aspetto"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Impostazioni dell'aspetto per questo sito di StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL del logo non valido."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema non disponibile: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Modifica logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo del sito"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Modifica tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema del sito"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema per questo sito."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Tema personalizzato"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Modifica l'immagine di sfondo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Sfondo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1178,75 +1177,76 @@ msgstr ""
"file è di %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "On"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Off"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Abilita o disabilita l'immagine di sfondo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Affianca l'immagine di sfondo"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Modifica colori"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Contenuto"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra laterale"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Testo"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Collegamenti"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avanzate"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalizzato"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usa predefiniti"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Ripristina i valori predefiniti"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Reimposta i valori predefiniti"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Salva"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Salva aspetto"
@@ -1324,7 +1324,7 @@ msgstr "Il callback è troppo lungo."
msgid "Callback URL is not valid."
msgstr "L'URL di callback non è valido."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Impossibile aggiornare l'applicazione."
@@ -1418,7 +1418,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annulla"
@@ -1890,6 +1890,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Rende l'utente amministratore del gruppo"
@@ -2336,6 +2342,110 @@ msgstr "Non fai parte di quel gruppo."
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Accesso già effettuato."
@@ -2564,8 +2674,8 @@ msgid "Connected applications"
msgstr "Applicazioni collegate"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2590,7 +2700,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Il messaggio non ha un profilo."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stato di %1$s su %2$s"
@@ -2756,8 +2866,8 @@ msgid "Paths"
msgstr "Percorsi"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Percorso e impostazioni server per questo sito StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3612,8 +3722,8 @@ msgid "Sessions"
msgstr "Sessioni"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Impostazioni di sessione per questo sito di StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3632,7 +3742,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Abilita il debug per le sessioni"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Salva impostazioni"
@@ -4540,75 +4649,79 @@ msgstr ""
"licenza \"%2$s\" di questo sito."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Utente"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Impostazioni utente per questo sito StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite per la biografia non valido. Deve essere numerico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profilo"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limite biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Lunghezza massima in caratteri della biografia"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nuovi utenti"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Messaggio per nuovi utenti"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Abbonamento predefinito"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Abbonare automaticamente i nuovi utenti a questo utente"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Inviti"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Inviti abilitati"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Indica se consentire agli utenti di invitarne di nuovi"
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizza abbonamento"
@@ -4622,7 +4735,9 @@ msgstr ""
"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licenza"
@@ -4821,6 +4936,15 @@ msgstr "Versione"
msgid "Author(s)"
msgstr "Autori"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Preferisci"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4863,6 +4987,17 @@ msgstr "Non si fa parte del gruppo."
msgid "Group leave failed."
msgstr "Uscita dal gruppo non riuscita."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Iscriviti"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4947,18 +5082,18 @@ msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5012,9 +5147,18 @@ msgstr "Impossibile salvare l'abbonamento."
msgid "Could not delete subscription."
msgstr "Impossibile salvare l'abbonamento."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenuti su %1$s, @%2$s!"
@@ -5338,19 +5482,19 @@ msgstr ""
"licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Precedenti"
@@ -5458,6 +5602,11 @@ msgstr "Modifica messaggio del sito"
msgid "Snapshots configuration"
msgstr "Configurazione snapshot"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5543,38 +5692,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL verso cui redirigere dopo l'autenticazione"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Browser"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipo di applicazione, browser o desktop"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Sola lettura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lettura-scrittura"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Annulla"
@@ -6072,10 +6221,6 @@ msgstr "Togli questo messaggio dai preferiti"
msgid "Favor this notice"
msgstr "Rendi questo messaggio un preferito"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Preferisci"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6093,8 +6238,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Esporta dati"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6287,10 +6432,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Sorgente casella in arrivo %d sconosciuta."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Iscriviti"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Lascia"
@@ -6984,7 +7125,7 @@ msgstr "Ripeti questo messaggio"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Nessun utente singolo definito per la modalità single-user."
@@ -7212,17 +7353,17 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7230,12 +7371,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7243,12 +7384,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7256,12 +7397,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7269,7 +7410,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "circa un anno fa"
@@ -7282,3 +7423,17 @@ msgstr "%s non è un colore valido."
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index c9d1ed335..dff6dc5c2 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:03+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:29+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -650,7 +650,7 @@ msgstr "見つかりません。"
msgid "Max notice size is %d chars, including attachment URL."
msgstr "つぶやきは URL を含めて最大 %d 字までです。"
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "サポート外の形式です。"
@@ -819,9 +819,8 @@ msgid "Do not block this user"
msgstr "このユーザをアンブロックする"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "このユーザをブロックする"
@@ -951,7 +950,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1042,52 +1041,52 @@ msgid "Design"
msgstr "デザイン"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "この StatusNet サイトのデザイン設定。"
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "不正なロゴ URL"
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "IM が利用不可。"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "ロゴの変更"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "サイトロゴ"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "テーマ変更"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "サイトテーマ"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "サイトのテーマ"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "バックグラウンドイメージの変更"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "バックグラウンド"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1097,75 +1096,76 @@ msgstr ""
"イズは %1$s。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "オン"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "オフ"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "バックグラウンドイメージのオンまたはオフ。"
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "タイルバックグラウンドイメージ"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "色の変更"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "サイドバー"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "テキスト"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "リンク"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "デフォルトを使用"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "デフォルトデザインに戻す。"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "デフォルトへリセットする"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "デザインの保存"
@@ -1243,7 +1243,7 @@ msgstr "コールバックが長すぎます。"
msgid "Callback URL is not valid."
msgstr "コールバックURLが不正です。"
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "アプリケーションを更新できません。"
@@ -1756,6 +1756,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "ユーザをグループの管理者にする"
@@ -2186,6 +2192,110 @@ msgstr "あなたはそのグループのメンバーではありません。"
msgid "%1$s left group %2$s"
msgstr "%1$s はグループ %2$s に残りました。"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "既にログインしています。"
@@ -2402,8 +2512,8 @@ msgid "Connected applications"
msgstr "接続されたアプリケーション"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "あなたのアカウントにアクセスする以下のアプリケーションを許可しました。"
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2423,7 +2533,7 @@ msgstr "開発者は彼らのアプリケーションのために登録設定を
msgid "Notice has no profile."
msgstr "ユーザはプロフィールをもっていません。"
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%2$s における %1$s のステータス"
@@ -2583,8 +2693,8 @@ msgid "Paths"
msgstr "パス"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "パスと StatusNet サイトのサーバー設定"
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3399,8 +3509,8 @@ msgid "Sessions"
msgstr "セッション"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "この StatusNet サイトのセッション設定。"
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3419,7 +3529,6 @@ msgid "Turn on debugging output for sessions."
msgstr "セッションのためのデバッグ出力をオン。"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "サイト設定の保存"
@@ -4261,69 +4370,73 @@ msgstr ""
"リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ"
"りません。"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "この StatusNet サイトのユーザ設定。"
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "不正な自己紹介制限。数字である必要があります。"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "不正なウェルカムテキスト。最大長は255字です。"
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "不正なデフォルトフォローです: '%1$s' はユーザではありません。"
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "プロファイル"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "自己紹介制限"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "プロファイル自己紹介の最大文字長。"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "新しいユーザ"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "新しいユーザを歓迎"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "デフォルトフォロー"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "招待"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "招待が可能"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "フォローを承認"
@@ -4337,7 +4450,9 @@ msgstr ""
"ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを"
"フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "ライセンス"
@@ -4522,6 +4637,15 @@ msgstr "バージョン"
msgid "Author(s)"
msgstr "作者"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "お気に入り"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4564,6 +4688,17 @@ msgstr "グループの一部ではありません。"
msgid "Group leave failed."
msgstr "グループ脱退に失敗しました。"
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "参加"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when trying creating a login token failed.
#. TRANS: %s is the user nickname for which token creation failed.
#: classes/Login_token.php:78
@@ -4642,18 +4777,18 @@ msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "グループ受信箱を保存する際に問題が発生しました。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4673,7 +4808,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "タグをを保存できません。"
@@ -4712,9 +4847,18 @@ msgstr "フォローを保存できません。"
msgid "Could not delete subscription."
msgstr "フォローを保存できません。"
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "ようこそ %1$s、@%2$s!"
@@ -4956,19 +5100,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "前>>"
@@ -5053,6 +5197,11 @@ msgstr "パス設定"
msgid "Sessions configuration"
msgstr "セッション設定"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5138,39 +5287,39 @@ msgid "URL to redirect to after authentication"
msgstr "認証の後にリダイレクトするURL"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "ブラウザ"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "デスクトップ"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "リードオンリー"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "リードライト"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
"ライト"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "中止"
@@ -5546,10 +5695,6 @@ msgstr "このつぶやきのお気に入りをやめる"
msgid "Favor this notice"
msgstr "このつぶやきをお気に入りにする"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "お気に入り"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5567,8 +5712,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "データのエクスポート"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5760,10 +5905,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr "不明な受信箱のソース %d。"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "参加"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "離れる"
@@ -6244,7 +6385,7 @@ msgstr "Yes"
msgid "Repeat this notice"
msgstr "このつぶやきを繰り返す"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "single-user モードのためのシングルユーザが定義されていません。"
@@ -6444,60 +6585,60 @@ msgid "Message"
msgstr "メッセージ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "数秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "約 1 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "約 1 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "約 1 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "約 1 ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "約 1 年前"
@@ -6510,3 +6651,17 @@ msgstr "%sは有効な色ではありません!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index a76101d6c..12d99f62c 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:04+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:30+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ msgstr "შეინახე შესვლის პარამეტრე
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "შეინახე"
@@ -680,7 +680,7 @@ msgstr "ვერ მოიძებნა."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "შეყობინების დასაშვები ზომაა %d სიმბოლო მიმაგრებული URL-ის ჩათვლით."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "ფორმატი არ არის მხარდაჭერილი."
@@ -873,9 +873,8 @@ msgid "Yes"
msgstr "დიახ"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "დაბლოკე ეს მომხმარებელი"
@@ -1011,7 +1010,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -1109,57 +1108,57 @@ msgid "Design"
msgstr "ამ მომხმარებლის წაშლა"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "ამ საიტის დიზაინის პარამეტრები"
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "ლოგოს არასწორი URL-ი"
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "იერსახე არ არის ხელმისაწვდომი %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "შეცვალე ლოგო"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "საიტის ლოგო"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "შეცვალე იერსახე"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "საიტის იერსახე"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "იერსახე ამ საიტისთვის"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "საკუთარი იერსახე"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
"თქვენ შეგიძლიათ ატვირთოთ საკუთარი StatusNet–იერსახე .ZIP არქივის სახით."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "შეცვალე ფონური სურათი"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "ფონი"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1169,75 +1168,76 @@ msgstr ""
"ზომაა %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "ჩართვა"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "გამორთვა"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "ჩართე ან გამორთე ფონური სურათის ფუნქცია."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "გაამრავლე ფონური სურათი"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "შეცვალე ფერები"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "შიგთავსი"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "გვერდითი პანელი"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "ტექსტი"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "ბმულები"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "მეტი პარამეტრები"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "საკუთარი CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "გამოიყენე პირვანდელი მდგომარეობა"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "დააბრუნე პირვანდელი დიზაინი"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "პირვანდელის პარამეტრების დაბრუნება"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "შენახვა"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "შეინახე დიზაინი"
@@ -1315,7 +1315,7 @@ msgstr ""
msgid "Callback URL is not valid."
msgstr ""
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "აპლიკაციის განახლება ვერ მოხერხდა."
@@ -1408,7 +1408,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "გაუქმება"
@@ -1877,6 +1877,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "მიანიჭე მომხმარებელს ჯგუფის ადმინობა"
@@ -2324,6 +2330,110 @@ msgstr "თვენ არ ხართ ამ ჯგუფის წევრ
msgid "%1$s left group %2$s"
msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "უკვე ავტორიზირებული ხართ."
@@ -2556,8 +2666,8 @@ msgid "Connected applications"
msgstr "მიერთებული აპლიკაციები"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "თქვენ შემდეგ აპლიკაციებს მიეცით თქვენს ანგარიშზე წვდომის უფლება."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2582,7 +2692,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "შეტყობინებას პრფილი არ გააჩნია."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s–ის სტატუსი %2$s–ზე"
@@ -2748,8 +2858,8 @@ msgid "Paths"
msgstr "გზები"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "ამ საიტის გზა და სერვერის პარამეტრები."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3600,8 +3710,8 @@ msgid "Sessions"
msgstr "სესიები"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "ამ საიტის სესიების პარამეტრები."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3620,7 +3730,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "საიტის პარამეტრების შენახვა"
@@ -4515,74 +4624,78 @@ msgstr ""
"ლიცენზიასთან ‘%2$s’."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "მომხმარებელი"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "მომხმარებლის პარამეტრები ამ საიტისათვის."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "ბიოგრაფიის არასწორი ლიმიტი. უნდა იყოს ციფრი."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "პროფილი"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "ბიოგრაფიის ლიმიტი"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "პროფილის ბიოგრაფიის მაქსიმალური ზომა სიმბოლოებში."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "ახალი მომხმარებლები"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "ახალი მომხმარებლის მისალმება"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "მისალმების ტექსტი ახალი მომხმარებლებისთვის (მაქს. 255 სიმბოლო)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr ""
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "ავტომატურად გამოაწერინე ამ მომხმარებელს ახალი მომხმარებლები."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "მოსაწვევეი"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "მოსაწვევები გააქტიურებულია"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "მიეცეთ თუ არა მომხმარებლებს სხვების მოწვევის უფლება."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "გამოწერის ავტორიზაცია"
@@ -4597,7 +4710,9 @@ msgstr ""
"განახლებების გამოწერა. თუ თქვენ არ გინდოდათ გამოწერა, მაშინ გააჭირეთ ღილაკს "
"\"უარყოფა\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "ლიცენზია"
@@ -4796,6 +4911,15 @@ msgstr "ვერსია"
msgid "Author(s)"
msgstr "ავტორი(ები)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "რჩეული"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4855,6 +4979,17 @@ msgstr "ჯგუფის წევრი არ ხართ."
msgid "Group leave failed."
msgstr "ჯგუფის დატოვება ვერ მოხერხდა."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "გაერთიანება"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4939,18 +5074,18 @@ msgid "Problem saving notice."
msgstr "პრობლემა შეტყობინების შენახვისას."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "saveKnownGroups-სათვის არასწორი ტიპია მოწოდებული"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "პრობლემა ჯგუფის ინდექსის შენახვისას."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4978,7 +5113,7 @@ msgid "Missing profile."
msgstr "პროფილი არ არსებობს."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "სანიშნეს დამახსოვრება ვერ ხერხდება."
@@ -5017,9 +5152,18 @@ msgstr "გამოწერის წაშლა ვერ მოხერხ
msgid "Could not delete subscription."
msgstr "გამოწერის წაშლა ვერ მოხერხდა."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "გამარჯობა @%2$s, კეთილი იყოს თქვენი მობრძანება %1$s-ზე!"
@@ -5339,19 +5483,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "წინა"
@@ -5459,6 +5603,11 @@ msgstr "საიტის შეტყობინების რედაქ
msgid "Snapshots configuration"
msgstr "წინა ვერსიების კონფიგურაცია"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5544,39 +5693,39 @@ msgid "URL to redirect to after authentication"
msgstr "ავტორიზაციის შემდეგ გადასამისამართებელი URL"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "ბროუზერი"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "ინსტალირებადი"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "აპლიკაციის ტიპი, ბროუზერისთვის ან ინსტალირებადი"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "მხოლოდ წაკითხვადი"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "კიტხვა-წერადი"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"შესვლის პირვანდელი მდგომარეობა ამ აპლიკაციისთვის: მხოლოდ წაკითხვადი, ან "
"კითხვა-წერადი"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "გაუქმება"
@@ -6033,10 +6182,6 @@ msgstr "ამოშალე რჩეულებიდან ეს შეტ
msgid "Favor this notice"
msgstr "ჩაამატე რჩეულებში ეს შეტყობინება"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "რჩეული"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6054,8 +6199,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "მონაცემების გატანა"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6251,10 +6396,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "გაერთიანება"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "დატოვება"
@@ -6927,7 +7068,7 @@ msgstr "შეტყობინების გამეორება"
msgid "Revoke the \"%s\" role from this user"
msgstr "ჩამოართვი \"%s\" როლი ამ მომხმარებელს"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "ერთი მომხმარებელი არ განსაზღვრულა ერთარედთი-მომხმარებლის რეჟიმისთვის."
@@ -7154,60 +7295,60 @@ msgid "Moderator"
msgstr "მოდერატორი"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "რამდენიმე წამის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "დაახლოებით 1 წუთის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "დაახლოებით 1 საათის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "დაახლოებით 1 დღის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "დაახლოებით 1 თვის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "დაახლოებით 1 წლის წინ"
@@ -7221,3 +7362,17 @@ msgstr "%s არ არის სწორი ფერი!"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s არ არის სწორი ფერი! გამოიყენეთ 3 ან 6 სიმბოლოიანი თექვსმეტობითი ციფრი."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 0a7d97343..885bb28d1 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:05+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:30+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -81,7 +81,7 @@ msgstr "접근 설정을 저장"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "저장"
@@ -664,7 +664,7 @@ msgstr "찾을 수가 없습니다."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "지원하지 않는 형식입니다."
@@ -834,9 +834,8 @@ msgid "Yes"
msgstr "예"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "이 사용자 차단하기"
@@ -962,7 +961,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1045,56 +1044,56 @@ msgid "Design"
msgstr "디자인"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "이 StatusNet 사이트에 대한 디자인 설정"
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "잘못된 로고 URL 입니다."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "인스턴트 메신저를 사용할 수 없습니다."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "로고 변경"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "사이트 로고"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "테마 바꾸기"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "사이트 테마"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "사이트에 대한 테마"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "사용자 지정 테마"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "배경 이미지 바꾸기"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "배경"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1103,71 +1102,72 @@ msgstr ""
"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "켜기"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "끄기"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "배경 이미지를 켜거나 끈다."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "배경 이미지를 반복 나열"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "색상 변경"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "만족하는"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "가장자리 창"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "문자"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "링크"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "고급 검색"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "사용자 정의 CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "저장"
@@ -1233,7 +1233,7 @@ msgstr ""
msgid "Callback URL is not valid."
msgstr ""
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "관심소식을 생성할 수 없습니다."
@@ -1326,7 +1326,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "취소"
@@ -1726,6 +1726,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -2138,6 +2144,110 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
msgid "%1$s left group %2$s"
msgstr "%1$s의 상태 (%2$s에서)"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "이미 로그인 하셨습니다."
@@ -2329,8 +2439,8 @@ msgid "Connected applications"
msgstr "연결한 응용프로그램"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "다음 응용 프로그램이 계정에 접근하도록 허용되어 있습니다."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:186
#, php-format
@@ -2345,7 +2455,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "이용자가 프로필을 가지고 있지 않습니다."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s의 상태 (%2$s에서)"
@@ -2490,6 +2600,10 @@ msgstr "비밀 번호 저장"
msgid "Paths"
msgstr "경로"
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -3144,6 +3258,10 @@ msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
msgid "User is already sandboxed."
msgstr "이용자의 지속적인 게시글이 없습니다."
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site"
+msgstr ""
+
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
msgstr ""
@@ -3161,7 +3279,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "접근 설정을 저장"
@@ -3929,55 +4046,65 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "사용자"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
+
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "프로필"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "구독을 허가"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "라이센스"
@@ -4115,6 +4242,15 @@ msgstr "플러그인"
msgid "Version"
msgstr "버전"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "좋아합니다"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4159,6 +4295,17 @@ msgstr "그룹에 가입하지 못했습니다."
msgid "Group leave failed."
msgstr "그룹에 가입하지 못했습니다."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "가입"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when trying creating a login token failed.
#. TRANS: %s is the user nickname for which token creation failed.
#: classes/Login_token.php:78
@@ -4219,13 +4366,13 @@ msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4245,7 +4392,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "태그를 저장할 수 없습니다."
@@ -4274,9 +4421,18 @@ msgstr "구독을 저장할 수 없습니다."
msgid "Could not delete subscription."
msgstr "구독을 저장할 수 없습니다."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s에 답신"
@@ -4559,19 +4715,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "앞 페이지"
@@ -4659,6 +4815,11 @@ msgstr "메일 주소 확인"
msgid "Snapshots configuration"
msgstr "메일 주소 확인"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4722,37 +4883,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "브라우저"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "데스크톱"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "읽기 전용"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "읽기 쓰기"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "취소"
@@ -5087,10 +5248,6 @@ msgstr "이 게시글 좋아하기 취소"
msgid "Favor this notice"
msgstr "이 게시글을 좋아합니다."
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "좋아합니다"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5108,8 +5265,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "데이터 내보내기"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5287,10 +5444,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "가입"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "떠나기"
@@ -5822,7 +5975,7 @@ msgstr "예"
msgid "Revoke the \"%s\" role from this user"
msgstr "그룹 이용자는 차단해제"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6020,60 +6173,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "1년 전"
@@ -6081,3 +6234,17 @@ msgstr "1년 전"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 75b672334..4b867999e 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:07+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:31+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Зачувај нагодувања на пристап"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Зачувај"
@@ -345,7 +345,7 @@ msgstr "Примачот не е пронајден."
#: actions/apidirectmessagenew.php:143
msgid "Can't send direct messages to users who aren't your friend."
msgstr ""
-"Неможете да испраќате директни пораки на корисници што не ви се пријатели."
+"Неможете да испраќате директни пораки на корисници што не Ви се пријатели."
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
@@ -695,7 +695,7 @@ msgstr ""
"Максималната големина на забелешката е %d знаци, вклучувајќи ја URL-адресата "
"на прилогот."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Неподдржан формат."
@@ -893,9 +893,8 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Блокирај го корисников"
@@ -1031,7 +1030,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1132,56 +1131,56 @@ msgid "Design"
msgstr "Изглед"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Нагодувања на изгледот на ова StatusNet-мрежно место."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Погрешен URL на лого."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Темата е недостапна: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Промени лого"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Лого на мрежното место"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Промени изглед"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Изглед на мрежното место"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Изглед за мрежното место."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Прилагоден мотив"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Можете да подигнете свој изглед за StatusNet како .ZIP архив."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Промена на слика на позадина"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Позадина"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1191,75 +1190,76 @@ msgstr ""
"големина на податотеката е %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Вкл."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Искл."
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Вклучи или исклучи позадинска слика."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Позадината во квадрати"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Промена на бои"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Содржина"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Странична лента"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Врски"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Напредно"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Прилагодено CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Користи по основно"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Врати основно-зададени нагодувања"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Врати по основно"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Зачувај"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Зачувај изглед"
@@ -1337,7 +1337,7 @@ msgstr "Повикувањето е предолго."
msgid "Callback URL is not valid."
msgstr "URL-адресата за повикување е неважечка."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Не можев да го подновам програмот."
@@ -1430,7 +1430,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Откажи"
@@ -1904,6 +1904,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Блокирај"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Направи го корисникот администратор на групата"
@@ -2136,7 +2142,7 @@ msgid ""
"s for sending messages to you."
msgstr ""
"Испративме потврден код на IM-адресата што ја додадовте. Ќе мора да му "
-"одобрите на %S да ви испраќа пораки."
+"одобрите на %s да Ви испраќа пораки."
#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
#: actions/imsettings.php:391
@@ -2265,7 +2271,7 @@ msgstr "Прати"
#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ве покани да се придружите на %2$s"
+msgstr "%1$s Ве покани да се придружите на %2$s"
#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
#: actions/invite.php:231
@@ -2300,8 +2306,8 @@ msgid ""
msgstr ""
"%1$s Ве кани да се придружите на %2$s (%3$s).\n"
"\n"
-"%2$s е мрежно место за микроблогирање што ви овозможува да бидете во тек "
-"луѓето што ги познавате и луѓето кои ве интересираат.\n"
+"%2$s е мрежно место за микроблогирање што Ви овозможува да бидете во тек "
+"луѓето што ги познавате и луѓето кои Ве интересираат.\n"
"\n"
"Можете да објавувате и новости за Вас, Ваши размисли, и настани од Вашиот "
"живот за да ги информирате луѓето што Ве знаат. Ова е воедно и одлично место "
@@ -2352,6 +2358,110 @@ msgstr "Не членувате во таа група."
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Веќе сте најавени."
@@ -2590,8 +2700,8 @@ msgid "Connected applications"
msgstr "Поврзани програми"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Им имате дозволено пристап до Вашата сметка на следните програми."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2615,7 +2725,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Забелешката нема профил."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s статус на %2$s"
@@ -2781,8 +2891,8 @@ msgid "Paths"
msgstr "Патеки"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Нагодувања за патеки и опслужувачи за оваа StatusNet мрежно место."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3453,7 +3563,7 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Ви честитаме %1$s! И ви пожелуваме добредојде на %%%%site.name%%%%. Оттука "
+"Ви честитаме %1$s! И Ви пожелуваме добредојде на %%%%site.name%%%%. Оттука "
"можете да...\n"
"\n"
"* Отидете на [Вашиот профил](%2$s) и објавете ја Вашата прва порака.\n"
@@ -3645,8 +3755,8 @@ msgid "Sessions"
msgstr "Сесии"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Нагодувања на сесиите за оваа StatusNet-мрежно место."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3665,7 +3775,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Вклучи извод од поправка на грешки за сесии."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Зачувај нагодувања на мреж. место"
@@ -3752,8 +3861,7 @@ msgstr ""
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr ""
-"Дали сте сигурни дека сакате да го смените вашиот кориснички клуч и тајната "
-"фраза?"
+"Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
#: actions/showfavorites.php:79
#, php-format
@@ -4475,7 +4583,7 @@ msgid ""
msgstr ""
"Моментално не следите ничии забелешки. Претплатете се на луѓе кои ги "
"познавате. Пробајте со [пребарување на луѓе](%%action.peoplesearch%%), "
-"побарајте луѓе во група која ве интересира и меѓу нашите [избрани корисници]"
+"побарајте луѓе во група која Ве интересира и меѓу нашите [избрани корисници]"
"(%%action.featured%%). Ако сте [корисник на Twitter](%%action.twittersettings"
"%%), тука можете автоматски да се претплатите на луѓе кои таму ги следите."
@@ -4590,74 +4698,78 @@ msgstr ""
"мрежното место „%2$s“."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Корисник"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Кориснички нагодувања за ова StatusNet-мрежно место."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Неважечко ограничување за биографијата. Мора да е бројчено."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Неважечки текст за добредојде. Дозволени се највеќе 255 знаци."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профил"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Ограничување за биографијата"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Максимална големина на профилната биографија во знаци."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Нови корисници"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Добредојде за нов корисник"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Текст за добредојде на нови корисници (највеќе до 255 знаци)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Основно-зададена претплата"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Автоматски претплатувај нови корисници на овој корисник."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Покани"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Поканите се овозможени"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Дали да им е дозволено на корисниците да канат други корисници."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Одобрете ја претплатата"
@@ -4672,7 +4784,9 @@ msgstr ""
"за забелешките на овој корисник. Ако не сакате да се претплатите, едноставно "
"кликнете на „Одбиј“"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Лиценца"
@@ -4873,6 +4987,15 @@ msgstr "Верзија"
msgid "Author(s)"
msgstr "Автор(и)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Омилено"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4930,6 +5053,17 @@ msgstr "Не е дел од групата."
msgid "Group leave failed."
msgstr "Напуштањето на групата не успеа."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Придружи се"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5014,18 +5148,18 @@ msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "На saveKnownGroups му е уакажан грешен тип"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Проблем при зачувувањето на групното приемно сандаче."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5054,7 +5188,7 @@ msgid "Missing profile."
msgstr "Недостасува профил."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Не можам да ја зачувам ознаката."
@@ -5088,9 +5222,18 @@ msgstr "Не можам да го избришам OMB-жетонот за пр
msgid "Could not delete subscription."
msgstr "Не можам да ја избришам претплатата."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
@@ -5413,19 +5556,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Претходно"
@@ -5533,6 +5676,11 @@ msgstr "Уреди објава за мрежното место"
msgid "Snapshots configuration"
msgstr "Поставки за снимки"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5559,7 +5707,7 @@ msgstr "Нема корисник за тој жетон."
#. TRANS: Client error thrown when authentication fails.
#: lib/apiauth.php:258 lib/apiauth.php:290
msgid "Could not authenticate you."
-msgstr "Не можевме да ве потврдиме."
+msgstr "Не можевме да Ве потврдиме."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
@@ -5618,38 +5766,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL за пренасочување по заверката"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Прелистувач"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Работна површина"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Тип на програм, прелистувач или работна површина"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Само читање"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Читање-пишување"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Основно-зададен пристап за овој програм: само читање, или читање-пишување"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Откажи"
@@ -6051,7 +6199,7 @@ msgstr ""
"follow <nickname> - претплати се на корисник\n"
"groups - список на групи кадешто членувате\n"
"subscriptions - список на луѓе кои ги следите\n"
-"subscribers - список на луѓе кои ве следат\n"
+"subscribers - список на луѓе кои Ве следат\n"
"leave <nickname> - откажи претплата на корисник\n"
"d <nickname> <text> - директна порака за корисник\n"
"get <nickname> - прикажи последна забелешка на корисник\n"
@@ -6145,10 +6293,6 @@ msgstr "Отстрани ја белешкава од омилени"
msgid "Favor this notice"
msgstr "Означи ја забелешкава како омилена"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Омилено"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6166,8 +6310,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Извези податоци"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6356,10 +6500,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Непознат извор на приемна пошта %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Придружи се"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Напушти"
@@ -6680,7 +6820,7 @@ msgstr ""
"\n"
"%6$s\n"
"\n"
-"Еве список на сите @-одговори за вас:\n"
+"Еве список на сите @-одговори за Вас:\n"
"\n"
"%7$s\n"
"\n"
@@ -6699,7 +6839,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
"Немате приватни пораки. Можете да испратите приватна порака за да се "
-"впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки "
+"впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
"што ќе можете да ги видите само Вие."
#: lib/mailbox.php:228 lib/noticelist.php:506
@@ -7058,7 +7198,7 @@ msgstr "Повтори ја забелешкава"
msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на корисников"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Не е зададен корисник за еднокорисничкиот режим."
@@ -7286,17 +7426,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "пред неколку секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7304,12 +7444,12 @@ msgstr[0] "пред околу една минута"
msgstr[1] "пред околу %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "пред еден час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7317,12 +7457,12 @@ msgstr[0] "пред околу еден час"
msgstr[1] "пред околу %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7330,12 +7470,12 @@ msgstr[0] "пред околу еден ден"
msgstr[1] "пред околу %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "пред еден месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7343,7 +7483,7 @@ msgstr[0] "пред околу еден месец"
msgstr[1] "пред околу %d месеци"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "пред една година"
@@ -7356,3 +7496,17 @@ msgstr "%s не е важечка боја!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 466cdba68..ae59c731f 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:10+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:34+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ msgstr "Lagre tilgangsinnstillinger"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Lagre"
@@ -644,7 +644,7 @@ msgstr "Ikke funnet."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formatet støttes ikke."
@@ -839,9 +839,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blokker denne brukeren"
@@ -1071,56 +1070,56 @@ msgid "Design"
msgstr "Utseende"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Ugyldig logo-URL."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema ikke tilgjengelig: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Endre logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Nettstedslogo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Endre tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Nettstedstema"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema for nettstedet."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Egendefinert tema"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Endre bakgrunnsbilde"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrunn"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1129,75 +1128,76 @@ 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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Slå på eller av bakgrunnsbilde."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Gjenta bakgrunnsbildet"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Endre farger"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Innhold"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidelinje"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Lenker"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avansert"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Egendefinert CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Bruk standard"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Gjenopprett standardutseende"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Tilbakestill til standardverdier"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Lagre"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Lagre utseende"
@@ -1275,7 +1275,7 @@ msgstr "Anrop er for langt."
msgid "Callback URL is not valid."
msgstr "Anrops-URL er ikke gyldig."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Kunne ikke oppdatere programmet."
@@ -1368,7 +1368,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
@@ -1834,6 +1834,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Gjør brukeren til en administrator for gruppen"
@@ -2272,13 +2278,117 @@ msgstr "Du er ikke et medlem av den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s forlot gruppe %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allerede innlogget."
#: actions/login.php:148
msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord"
+msgstr "Feil brukernavn eller passord."
#: actions/login.php:154 actions/otp.php:120
msgid "Error setting user. You are probably not authorized."
@@ -2509,8 +2619,8 @@ msgid "Connected applications"
msgstr "Tilkoblede program"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Du har tillatt følgende programmer å få tilgang til den konto."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2533,7 +2643,7 @@ msgstr "Utviklere kan redigere registreringsinnstillingene for sine program "
msgid "Notice has no profile."
msgstr "Notisen har ingen profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
@@ -2693,8 +2803,8 @@ msgid "Paths"
msgstr "Stier"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Sti- og tjenerinnstillinger for dette StatusNet-nettstedet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2889,7 +2999,7 @@ msgstr "Profilinformasjon"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom"
+msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
@@ -3269,7 +3379,7 @@ msgstr "E-postadressen finnes allerede."
#: actions/register.php:250 actions/register.php:272
msgid "Invalid username or password."
-msgstr "Ugyldig brukernavn eller passord"
+msgstr "Ugyldig brukernavn eller passord."
#: actions/register.php:350
msgid ""
@@ -3281,8 +3391,7 @@ msgstr ""
#: actions/register.php:432
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd."
+msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
#: actions/register.php:437
msgid "6 or more characters. Required."
@@ -3545,8 +3654,8 @@ msgid "Sessions"
msgstr "Økter"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Øktinnstillinger for dette StatusNet-nettstedet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3565,7 +3674,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Slå på feilsøkingsutdata for økter."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Lagre nettstedsinnstillinger"
@@ -4375,74 +4483,78 @@ msgid "You haven't blocked that user."
msgstr "Du har ikke blokkert den brukeren."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Bruker"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Brukerinnstillinger for dette StatusNet-nettstedet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Ugyldig biografigrense. Må være numerisk."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Biografigrense"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Maks lengde på en profilbiografi i tegn."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nye brukere"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Velkomst av ny bruker"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Standardabonnement"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Invitasjoner"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Invitasjoner aktivert"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Hvorvidt brukere tillates å invitere nye brukere."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser abonnementet"
@@ -4454,7 +4566,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Lisens"
@@ -4621,6 +4735,11 @@ msgstr "Versjon"
msgid "Author(s)"
msgstr "Forfatter(e)"
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4675,6 +4794,17 @@ msgstr "Kunne ikke oppdatere gruppe."
msgid "Group leave failed."
msgstr "Gruppeprofil"
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Bli med"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4739,18 +4869,18 @@ msgid "Problem saving notice."
msgstr "Problem ved lagring av notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problem ved lagring av gruppeinnboks."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4794,9 +4924,18 @@ msgstr "Kunne ikke slette favoritt."
msgid "Could not delete subscription."
msgstr "Kunne ikke slette favoritt."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Velkommen til %1$s, @%2$s."
@@ -5094,13 +5233,13 @@ msgstr ""
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Før"
@@ -5177,6 +5316,11 @@ msgstr "Stikonfigurasjon"
msgid "Edit site notice"
msgstr "Rediger nettstedsnotis"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5255,39 +5399,39 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Nettleser"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Skrivebord"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Type program, nettleser eller skrivebord"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Skrivebeskyttet"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Les og skriv"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
"skrivetilgang"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Avbryt"
@@ -5667,8 +5811,8 @@ msgid "FOAF"
msgstr "Venn av en venn"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Eksporter data"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:131
msgid "All"
@@ -5838,10 +5982,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Ukjent innbokskilde %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Bli med"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Forlat"
@@ -6484,7 +6624,7 @@ msgstr "Ja"
msgid "Repeat this notice"
msgstr "Repeter denne notisen"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6655,17 +6795,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -6673,12 +6813,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -6686,12 +6826,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -6699,12 +6839,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -6712,7 +6852,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "omtrent ett år siden"
@@ -6725,3 +6865,17 @@ msgstr "%s er ikke en gyldig farge."
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index ff15376df..d27d97378 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:13+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:33+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Toegangsinstellingen opslaan"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Opslaan"
@@ -708,7 +708,7 @@ msgstr ""
"De maximale mededelingenlengte is %d tekens, inclusief de URL voor de "
"bijlage."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Niet-ondersteund bestandsformaat."
@@ -905,9 +905,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Deze gebruiker blokkeren"
@@ -1043,7 +1042,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1145,56 +1144,56 @@ msgid "Design"
msgstr "Uiterlijk"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Instellingen voor de vormgeving van deze StatusNet-website."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "De logo-URL is ongeldig."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "De vormgeving is niet beschikbaar: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Logo wijzigen"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Websitelogo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Vormgeving wijzigen"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Vormgeving website"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Mogelijke vormgevingen voor deze website."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Aangepaste vormgeving"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Achtergrondafbeelding wijzigen"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Achtergrond"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1204,75 +1203,76 @@ msgstr ""
"bestandsgrootte is %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Aan"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Uit"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Achtergrondafbeelding naast elkaar"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Kleuren wijzigen"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Inhoud"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Menubalk"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Verwijzingen"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Uitgebreid"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Aangepaste CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Standaardinstellingen gebruiken"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Standaardontwerp toepassen"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Standaardinstellingen toepassen"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Opslaan"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Ontwerp opslaan"
@@ -1350,7 +1350,7 @@ msgstr "De callback is te lang."
msgid "Callback URL is not valid."
msgstr "De callback-URL is niet geldig."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Het was niet mogelijk de applicatie bij te werken."
@@ -1443,7 +1443,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Annuleren"
@@ -1921,6 +1921,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Blokkeren"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Deze gebruiker groepsbeheerder maken"
@@ -2223,7 +2229,7 @@ msgstr "Nieuwe gebruikers uitnodigen"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr "U bent als geabonneerd op deze gebruikers:"
+msgstr "U bent al geabonneerd op deze gebruikers:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2372,6 +2378,110 @@ msgstr "U bent geen lid van deze groep"
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "U bent al aangemeld."
@@ -2610,9 +2720,8 @@ msgid "Connected applications"
msgstr "Verbonden applicaties"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
-"U hebt de volgende applicaties toegang gegeven tot uw gebruikersgegevens."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2640,7 +2749,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Mededeling heeft geen profiel."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Status van %1$s op %2$s"
@@ -2804,8 +2913,8 @@ msgid "Paths"
msgstr "Paden"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Pad- en serverinstellingen voor de StatusNet-website."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3457,9 +3566,8 @@ msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"Mijn teksten en bestanden zijn beschikbaar onder %s, \n"
-"behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
-"telefoonnummer."
+"Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
+"privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
#: actions/register.php:583
#, php-format
@@ -3671,8 +3779,8 @@ msgid "Sessions"
msgstr "Sessies"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Sessieinstellingen voor deze StatusNet-website."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3691,7 +3799,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Debuguitvoer voor sessies inschakelen."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Websiteinstellingen opslaan"
@@ -4624,74 +4731,78 @@ msgstr ""
"de sitelicentie \"%2$s\"."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Gebruiker"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Gebruikersinstellingen voor deze StatusNet-website."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profiel"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Profiellimiet"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "De maximale lengte van de profieltekst in tekens."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nieuwe gebruikers"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Welkom voor nieuwe gebruikers"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Standaardabonnement"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Uitnodigingen"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Uitnodigingen ingeschakeld"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Abonneren"
@@ -4707,7 +4818,9 @@ msgstr ""
"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
"klik dan op \"Afwijzen\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licentie"
@@ -4718,7 +4831,7 @@ msgstr "Aanvaarden"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr "Abonneer mij op deze gebruiker"
+msgstr "Abonneren op deze gebruiker"
#: actions/userauthorization.php:219
msgid "Reject"
@@ -4907,6 +5020,15 @@ msgstr "Versie"
msgid "Author(s)"
msgstr "Auteur(s)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Aan favorieten toevoegen"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4965,6 +5087,17 @@ msgstr "Geen lid van groep."
msgid "Group leave failed."
msgstr "Groepslidmaatschap opzeggen is mislukt."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Toetreden"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5054,12 +5187,12 @@ msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Het gegevenstype dat is opgegeven aan saveKnownGroups is onjuist"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -5067,7 +5200,7 @@ msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5096,7 +5229,7 @@ msgid "Missing profile."
msgstr "Ontbrekend profiel."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Het was niet mogelijk om het label op te slaan."
@@ -5136,9 +5269,18 @@ msgstr ""
msgid "Could not delete subscription."
msgstr "Kon abonnement niet verwijderen."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
@@ -5462,19 +5604,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Eerder"
@@ -5582,6 +5724,11 @@ msgstr "Websitebrede mededeling opslaan"
msgid "Snapshots configuration"
msgstr "Snapshotinstellingen"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5667,38 +5814,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL om naar door te verwijzen na authenticatie"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Browser"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Type applicatie; browser of desktop"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Alleen-lezen"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Lezen en schrijven"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Annuleren"
@@ -6202,10 +6349,6 @@ msgstr "Uit de favorietenlijst verwijderen"
msgid "Favor this notice"
msgstr "Op de favorietenlijst plaatsen"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Aan favorieten toevoegen"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6223,8 +6366,8 @@ msgid "FOAF"
msgstr "Vrienden van vrienden (FOAF)"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Feeds"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6418,10 +6561,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Onbekende bron Postvak IN %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Toetreden"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Verlaten"
@@ -7119,7 +7258,7 @@ msgstr "Deze mededeling herhalen"
msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Er is geen gebruiker gedefinieerd voor single-usermodus."
@@ -7353,17 +7492,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7371,12 +7510,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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7384,12 +7523,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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7397,12 +7536,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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7410,7 +7549,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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
@@ -7423,3 +7562,17 @@ msgstr "%s is geen geldige kleur."
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 2091d1431..40b8d9b5a 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:11+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:33+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -587,9 +587,8 @@ msgid "No"
msgstr "Merknad"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blokkér denne brukaren"
@@ -692,7 +691,7 @@ msgstr "Fann ikkje stadfestingskode."
#. 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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -744,88 +743,89 @@ msgid "Design"
msgstr ""
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Endra"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Statusmelding"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr ""
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Innhald"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr ""
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr ""
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Lagra"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1259,6 +1259,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr ""
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#. TRANS: Button text for the form that will make a user administrator.
#: actions/groupmembers.php:533
msgctxt "BUTTON"
@@ -1634,13 +1640,117 @@ msgstr "Du er ikkje medlem av den gruppa."
msgid "%1$s left group %2$s"
msgstr "%1$s sin status på %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Allereie logga inn."
#: actions/login.php:148
msgid "Incorrect username or password."
-msgstr "Feil brukarnamn eller passord"
+msgstr "Feil brukarnamn eller passord."
#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
msgid "Login"
@@ -1789,7 +1899,7 @@ msgid "Connected applications"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -1809,7 +1919,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Brukaren har inga profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s sin status på %2$s"
@@ -1942,7 +2052,7 @@ msgid "Paths"
msgstr ""
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:183
@@ -2550,7 +2660,7 @@ msgid "Sessions"
msgstr ""
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:175
@@ -3272,49 +3382,53 @@ msgid ""
"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autoriser tinging"
@@ -3443,6 +3557,15 @@ msgstr ""
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Tjeneste"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3482,6 +3605,17 @@ msgstr ""
msgid "Invalid filename."
msgstr "Ugyldig filnamn."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Bli med"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3534,13 +3668,13 @@ msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -3560,7 +3694,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Kunne ikkje lagra emneord."
@@ -3584,6 +3718,15 @@ msgstr "Kunne ikkje lagra abonnement."
msgid "Could not delete subscription."
msgstr "Kunne ikkje lagra abonnement."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Server exception thrown when creating a group failed.
#: classes/User_group.php:496
msgid "Could not create group."
@@ -3789,19 +3932,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Før »"
@@ -3830,6 +3973,11 @@ msgstr ""
msgid "User"
msgstr "Brukar"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -3892,37 +4040,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Avbryt"
@@ -4260,10 +4408,6 @@ msgstr "Fjern favoriseringsmerket"
msgid "Favor this notice"
msgstr "Favoriser denne notisen"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Tjeneste"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -4281,8 +4425,8 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Eksporter data"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -4456,10 +4600,6 @@ msgstr ""
msgid "Unknown inbox source %d."
msgstr ""
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Bli med"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Forlat"
@@ -4963,7 +5103,7 @@ msgstr "Populære"
msgid "Yes"
msgstr "Jau"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5130,17 +5270,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -5148,12 +5288,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -5161,12 +5301,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -5174,12 +5314,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -5187,7 +5327,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
@@ -5195,3 +5335,17 @@ msgstr "omtrent eitt år sidan"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 879e8e062..3a49234ba 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:14+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:35+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ msgstr "Zapisz ustawienia dostępu"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Zapisz"
@@ -694,7 +694,7 @@ msgstr "Nie odnaleziono."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Nieobsługiwany format."
@@ -889,9 +889,8 @@ msgid "Yes"
msgstr "Tak"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Zablokuj tego użytkownika"
@@ -1027,7 +1026,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -1127,56 +1126,56 @@ msgid "Design"
msgstr "Wygląd"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Ustawienia wyglądu tej witryny StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Nieprawidłowy adres URL logo."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Motyw nie jest dostępny: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Zmień logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo witryny"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Zmień motyw"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Motyw witryny"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Motyw witryny."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Własny motyw"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Zmień obraz tła"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Tło"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1184,75 +1183,76 @@ 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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Włączone"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Wyłączone"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Włącz lub wyłącz obraz tła."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Kafelkowy obraz tła"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Zmień kolory"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Treść"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Panel boczny"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Tekst"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Odnośniki"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Zaawansowane"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Własny plik CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Użycie domyślnych"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Przywróć domyślny wygląd"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Przywróć domyślne ustawienia"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Zapisz"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Zapisz wygląd"
@@ -1330,7 +1330,7 @@ msgstr "Adres zwrotny jest za długi."
msgid "Callback URL is not valid."
msgstr "Adres zwrotny URL jest nieprawidłowy."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Nie można zaktualizować aplikacji."
@@ -1424,7 +1424,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Anuluj"
@@ -1889,6 +1889,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Zablokuj"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Uczyń użytkownika administratorem grupy"
@@ -1897,13 +1903,13 @@ msgstr "Uczyń użytkownika administratorem grupy"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Uczyń administratorem"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Nadaje temu użytkownikowi uprawnienia administratora"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -2335,6 +2341,110 @@ msgstr "Nie jesteś członkiem tej grupy."
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Jesteś już zalogowany."
@@ -2573,8 +2683,8 @@ msgid "Connected applications"
msgstr "Połączone aplikacje"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Zezwolono następującym aplikacjom na dostęp do konta."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2597,7 +2707,7 @@ msgstr "Programiści mogą zmodyfikować ustawienia rejestracji swoich aplikacji
msgid "Notice has no profile."
msgstr "Wpis nie posiada profilu."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Stan użytkownika %1$s na %2$s"
@@ -2761,8 +2871,8 @@ msgid "Paths"
msgstr "Ścieżki"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Ustawienia ścieżki i serwera dla tej witryny StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3618,8 +3728,8 @@ msgid "Sessions"
msgstr "Sesje"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Ustawienia sesji tej witryny StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3638,7 +3748,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Włącza wyjście debugowania dla sesji."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Zapisz ustawienia witryny"
@@ -4561,74 +4670,78 @@ msgstr ""
"witryny \"%2$s\"."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Użytkownik"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Ustawienia użytkownika dla tej witryny StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Ograniczenie informacji o sobie"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Maksymalna długość informacji o sobie jako liczba znaków."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nowi użytkownicy"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Powitanie nowego użytkownika"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Domyślna subskrypcja"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Zaproszenia"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Zaproszenia są włączone"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Upoważnij subskrypcję"
@@ -4643,7 +4756,9 @@ msgstr ""
"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
"naciśnij \"Odrzuć\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licencja"
@@ -4841,6 +4956,15 @@ msgstr "Wersja"
msgid "Author(s)"
msgstr "Autorzy"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Dodaj do ulubionych"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4900,6 +5024,17 @@ msgstr "Nie jest częścią grupy."
msgid "Group leave failed."
msgstr "Opuszczenie grupy nie powiodło się."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Dołącz"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4984,18 +5119,18 @@ msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Podano błędne dane do saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5021,7 +5156,7 @@ msgid "Missing profile."
msgstr "Brak profilu."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Nie można zapisać etykiety."
@@ -5060,9 +5195,18 @@ msgstr "Nie można usunąć tokenu subskrypcji OMB."
msgid "Could not delete subscription."
msgstr "Nie można usunąć subskrypcji."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s."
@@ -5387,19 +5531,19 @@ msgstr ""
"$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Wcześniej"
@@ -5507,6 +5651,11 @@ msgstr "Zmodyfikuj wpis witryny"
msgid "Snapshots configuration"
msgstr "Konfiguracja migawek"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5517,33 +5666,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 "Brak aplikacji dla tego klucza klienta."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Błędny token dostępu."
#. 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 "Brak użytkownika dla tego tokenu."
#. 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 "Nie można uwierzytelnić."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Spróbowano unieważnić nieznany token."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5592,38 +5741,38 @@ msgid "URL to redirect to after authentication"
msgstr "Adres URL do przekierowania po uwierzytelnieniu"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Przeglądarka"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Pulpit"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Typ aplikacji, przeglądarka lub pulpit"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Tylko do odczytu"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Odczyt i zapis"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Anuluj"
@@ -6121,10 +6270,6 @@ msgstr "Usuń ten wpis z ulubionych"
msgid "Favor this notice"
msgstr "Dodaj ten wpis do ulubionych"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Dodaj do ulubionych"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6142,8 +6287,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Wyeksportuj dane"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6219,7 +6364,7 @@ msgstr "Grupa %s"
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Członkowie"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6227,7 +6372,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Członkowie grupy %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
@@ -6241,7 +6386,7 @@ msgstr "Zablokowany"
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "%s zablokowanych użytkowników"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6249,7 +6394,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Modyfikacja właściwości grupy %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
@@ -6263,7 +6408,7 @@ msgstr "Logo"
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Dodanie lub modyfikacja loga grupy %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6271,7 +6416,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Dodanie lub modyfikacja wyglądu grupy %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6339,10 +6484,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Nieznane źródło skrzynki odbiorczej %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Dołącz"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Opuść"
@@ -6773,13 +6914,15 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" nie jest obsługiwanym typem pliku na tym serwerze. Proszę spróbować "
+"innego formatu %2$s."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "\"%s\" nie jest obsługiwanym typem pliku na tym serwerze."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6898,20 +7041,20 @@ msgstr "Wyślij szturchnięcie do tego użytkownika"
#: lib/oauthstore.php:283
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Błąd podczas wprowadzania nowego profilu."
#: lib/oauthstore.php:291
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Błąd podczas wprowadzania awatara."
#: lib/oauthstore.php:311
msgid "Error inserting remote profile."
-msgstr ""
+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
msgid "Duplicate notice."
-msgstr ""
+msgstr "Podwójny wpis."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -7033,7 +7176,7 @@ msgstr "Powtórz ten wpis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Unieważnij rolę \"%s\" tego użytkownika"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
"Nie określono pojedynczego użytkownika dla trybu pojedynczego użytkownika."
@@ -7265,68 +7408,68 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "około minuty temu"
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "około godziny temu"
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "około jednego dnia temu"
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "około miesiąca temu"
+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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "około rok temu"
@@ -7341,3 +7484,17 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków "
"szesnastkowych."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 37a54142d..e82660127 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:16+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:36+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ msgstr "Gravar configurações de acesso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Gravar"
@@ -689,7 +689,7 @@ msgstr "Não encontrado."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato não suportado."
@@ -884,9 +884,8 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloquear este utilizador"
@@ -1022,7 +1021,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -1123,58 +1122,58 @@ msgid "Design"
msgstr "Estilo"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Configurações do estilo deste site StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "URL do logotipo inválida."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não está disponível: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Alterar logotipo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logotipo do site"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Alterar tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "O tema para o site."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Alterar imagem de fundo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1184,75 +1183,76 @@ msgstr ""
"é %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Ligar"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Desligar"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ligar ou desligar a imagem de fundo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Repetir imagem de fundo em mosaico"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar cores"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar predefinições"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Repor estilos predefinidos"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Repor predefinição"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Gravar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Gravar o estilo"
@@ -1330,7 +1330,7 @@ msgstr "Callback é demasiado longo."
msgid "Callback URL is not valid."
msgstr "A URL de callback é inválida."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Não foi possível actualizar a aplicação."
@@ -1423,7 +1423,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1896,6 +1896,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Bloquear"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Tornar utilizador o gestor do grupo"
@@ -2342,6 +2348,110 @@ msgstr "Não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Sessão já foi iniciada."
@@ -2577,8 +2687,8 @@ msgid "Connected applications"
msgstr "Aplicações ligadas"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Permitiu que as seguintes aplicações acedam à sua conta."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2602,7 +2712,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Nota não tem perfil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Estado de %1$s em %2$s"
@@ -2767,8 +2877,8 @@ msgid "Paths"
msgstr "Localizações"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Configurações de localização e servidor deste site StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3629,8 +3739,8 @@ msgid "Sessions"
msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Configurações da sessão para este site StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3649,7 +3759,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Ligar a impressão de dados de depuração, para sessões."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Gravar configurações do site"
@@ -4569,74 +4678,78 @@ msgstr ""
"site."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Utilizador"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Configurações do utilizador para este site StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite da biografia inválido. Tem de ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limite da Biografia"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Tamanho máximo de uma biografia em caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Utilizadores novos"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Boas-vindas a utilizadores novos"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Subscrição predefinida"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Convites"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Convites habilitados"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar subscrição"
@@ -4651,7 +4764,9 @@ msgstr ""
"subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
"as notas de alguém, simplesmente clique \"Rejeitar\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licença"
@@ -4849,6 +4964,15 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autores"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Eleger como favorita"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4906,6 +5030,17 @@ msgstr "Não faz parte do grupo."
msgid "Group leave failed."
msgstr "Saída do grupo falhou."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Juntar-me"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4990,18 +5125,18 @@ msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "O tipo fornecido ao método saveKnownGroups é incorrecto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problema na gravação da caixa de entrada do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5029,7 +5164,7 @@ msgid "Missing profile."
msgstr "Perfil não existe."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Não foi possível gravar a categoria."
@@ -5068,9 +5203,18 @@ msgstr "Não foi possível apagar a chave OMB da subscrição."
msgid "Could not delete subscription."
msgstr "Não foi possível apagar a subscrição."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
@@ -5395,19 +5539,19 @@ msgstr ""
"licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Anteriores"
@@ -5517,6 +5661,11 @@ msgstr "Editar aviso do site"
msgid "Snapshots configuration"
msgstr "Configuração dos instântaneos"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5600,37 +5749,37 @@ msgid "URL to redirect to after authentication"
msgstr "URL para onde reencaminhar após autenticação"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Browser"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipo da aplicação, browser ou desktop"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Leitura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Leitura e escrita"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancelar"
@@ -6124,10 +6273,6 @@ msgstr "Retirar esta nota das favoritas"
msgid "Favor this notice"
msgstr "Eleger esta nota como favorita"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Eleger como favorita"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6145,8 +6290,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar dados"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6255,7 +6400,7 @@ msgstr "Editar propriedades do grupo %s"
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr "Logotipo"
+msgstr "Logótipo"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6263,7 +6408,7 @@ msgstr "Logotipo"
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr "Adicionar ou editar o logotipo de %s"
+msgstr "Adicionar ou editar o logótipo de %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6339,10 +6484,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Origem da caixa de entrada desconhecida \"%s\"."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Juntar-me"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Afastar-me"
@@ -7037,7 +7178,7 @@ msgstr "Repetir esta nota"
msgid "Revoke the \"%s\" role from this user"
msgstr "Retirar a função \"%s\" a este utilizador"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Nenhum utilizador único definido para o modo de utilizador único."
@@ -7266,17 +7407,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7284,12 +7425,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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7297,12 +7438,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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7310,12 +7451,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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7323,7 +7464,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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "há cerca de um ano"
@@ -7336,3 +7477,17 @@ msgstr "%s não é uma cor válida!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 4a286a4bc..616c910c3 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:17+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:37+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -86,7 +86,7 @@ msgstr "Salvar as configurações de acesso"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Salvar"
@@ -702,7 +702,7 @@ msgstr "Não encontrado."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "O tamanho máximo da mensagem é de %d caracteres"
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Formato não suportado."
@@ -899,9 +899,8 @@ msgid "Yes"
msgstr "Sim"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Bloquear este usuário"
@@ -1037,7 +1036,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1138,58 +1137,58 @@ msgid "Design"
msgstr "Aparência"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Configurações da aparência deste site StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema não disponível: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Alterar a logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Logo do site"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Alterar o tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Tema do site"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema para o site."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Tema personalizado"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Alterar imagem do fundo"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Fundo"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1199,75 +1198,76 @@ msgstr ""
"arquivo é de %1 $s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Ativado"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Desativado"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Ativar/desativar a imagem de fundo."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Ladrilhar a imagem de fundo"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Alterar a cor"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Conteúdo"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Barra lateral"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Texto"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Links"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avançado"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "CSS personalizado"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Usar o padrão|"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Restaura a aparência padrão"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Restaura de volta ao padrão"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Salvar"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Salvar a aparência"
@@ -1345,7 +1345,7 @@ msgstr "O retorno é muito extenso."
msgid "Callback URL is not valid."
msgstr "A URL de retorno não é válida."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Não foi possível atualizar a aplicação."
@@ -1438,7 +1438,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1913,6 +1913,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Bloquear"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Tornar o usuário um administrador do grupo"
@@ -2361,6 +2367,110 @@ msgstr "Você não é um membro desse grupo."
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Já está autenticado."
@@ -2603,8 +2713,8 @@ msgid "Connected applications"
msgstr "Aplicações conectadas"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Você permitiu que as seguintes aplicações acessem a sua conta."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2629,7 +2739,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "A mensagem não está associada a nenhum perfil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Mensagem de %1$s no %2$s"
@@ -2795,8 +2905,8 @@ msgid "Paths"
msgstr "Caminhos"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Configurações dos caminhos e do servidor para este site StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3657,8 +3767,8 @@ msgid "Sessions"
msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Configurações da sessão deste site StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3677,7 +3787,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Ativa a saída de depuração para as sessões."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Salvar as configurações do site"
@@ -4595,75 +4704,79 @@ msgstr ""
"do site."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Usuário"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Configurações de usuário para este site StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Limite da descrição inválido. Seu valor deve ser numérico."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Perfil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Limite da descrição"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Comprimento máximo da descrição do perfil, em caracteres."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Novos usuários"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Boas vindas aos novos usuários"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Assinatura padrão"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Os novos usuários assinam esse usuário automaticamente."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Convites"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Convites habilitados"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Define se os usuários podem ou não convidar novos usuários."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Autorizar a assinatura"
@@ -4678,7 +4791,9 @@ msgstr ""
"as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
"alguém, clique em \"Recusar\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licença"
@@ -4879,6 +4994,15 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autor(es)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Tornar favorita"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4935,6 +5059,17 @@ msgstr "Não é parte de um grupo."
msgid "Group leave failed."
msgstr "Não foi possível deixar o grupo."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Entrar"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5019,18 +5154,18 @@ msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "O tipo fornecido ao método saveKnownGroups é incorreto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problema no salvamento das mensagens recebidas do grupo."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5057,7 +5192,7 @@ msgid "Missing profile."
msgstr "Perfil não existe."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Não foi salvar gravar a categoria."
@@ -5096,9 +5231,18 @@ msgstr "Não foi possível salvar a assinatura."
msgid "Could not delete subscription."
msgstr "Não foi possível salvar a assinatura."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bem vindo(a) a %1$s, @%2$s!"
@@ -5419,19 +5563,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Anterior"
@@ -5541,6 +5685,11 @@ msgstr "Editar os avisos do site"
msgid "Snapshots configuration"
msgstr "Configurações das estatísticas"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5561,23 +5710,23 @@ msgstr "Token de acesso incorreto."
#. 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 "Nenhum usuário para esse código."
#. 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 "Não foi possível autenticá-lo."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Tentou revogar um código desconhecido."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Falha ao eliminar código revogado."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5626,38 +5775,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL para o redirecionamento após a autenticação"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Navegador"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Desktop"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Tipo de aplicação: navegador ou desktop"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Somente leitura"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Leitura e escrita"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Cancelar"
@@ -6156,10 +6305,6 @@ msgstr "Excluir das favoritas"
msgid "Favor this notice"
msgstr "Acrescentar às favoritas"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Tornar favorita"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6177,8 +6322,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar os dados"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6239,7 +6384,7 @@ msgstr ""
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6247,13 +6392,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "Grupo %s"
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Membros"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6261,13 +6406,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Membros do grupo %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6275,7 +6420,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "Usuários bloqueados de %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6283,13 +6428,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Editar propriedades do grupo %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Logotipo"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6297,7 +6442,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Adicionar ou editar o logotipo de %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6305,7 +6450,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Adicionar ou editar a aparência de %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6373,10 +6518,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Fonte da caixa de entrada desconhecida %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Entrar"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Sair"
@@ -6812,13 +6953,15 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" não é um tipo de arquivo suportado neste servidor. Tente usar outro "
+"formato de %2$s."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "\"%s\" não é um tipo de arquivo suportado neste servidor."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6937,20 +7080,20 @@ msgstr "Chame a atenção deste usuário"
#: lib/oauthstore.php:283
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Erro ao inserir perfil novo."
#: lib/oauthstore.php:291
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Erro ao inserir avatar."
#: lib/oauthstore.php:311
msgid "Error inserting remote profile."
-msgstr ""
+msgstr "Erro ao inserir perfil remoto."
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
#: lib/oauthstore.php:346
msgid "Duplicate notice."
-msgstr ""
+msgstr "Nota duplicada."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -7072,7 +7215,7 @@ msgstr "Repetir esta mensagem"
msgid "Revoke the \"%s\" role from this user"
msgstr "Revoga o papel \"%s\" deste usuário"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Nenhum usuário definido para o modo de usuário único."
@@ -7098,7 +7241,7 @@ msgstr "Palavra(s)-chave"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Pesquisar"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -7300,64 +7443,64 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
@@ -7370,3 +7513,17 @@ msgstr "%s não é uma cor válida!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 67326b72f..1a05b2b65 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:19+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:37+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -86,7 +86,7 @@ msgstr "Сохранить настройки доступа"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Сохранить"
@@ -557,7 +557,7 @@ msgstr "Неправильный токен"
#: 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 "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
#: actions/apioauthauthorize.php:135
msgid "Invalid nickname / password!"
@@ -582,7 +582,7 @@ msgstr ""
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
-msgstr "Запрос токена %s был запрещен и аннулирован."
+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.
@@ -697,7 +697,7 @@ msgstr "Не найдено."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Максимальная длина записи — %d символов, включая URL вложения."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Неподдерживаемый формат."
@@ -893,9 +893,8 @@ msgid "Yes"
msgstr "Да"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Заблокировать пользователя."
@@ -1031,9 +1030,9 @@ 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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+msgstr "Проблема с вашим ключом сессии."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
msgid "Delete application"
@@ -1132,56 +1131,56 @@ msgid "Design"
msgstr "Оформление"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Настройки оформления для этого сайта StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Неверный URL логотипа."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Тема не доступна: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Изменить логотип"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Логотип сайта"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Изменить тему"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Тема сайта"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Тема для сайта."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Особая тема"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Вы можете загрузить особую тему StatusNet в виде ZIP-архива."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Изменение фонового изображения"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1191,75 +1190,76 @@ msgstr ""
"составляет %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Включить"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Отключить"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Включить или отключить показ фонового изображения."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Растянуть фоновое изображение"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Изменение цветовой гаммы"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Содержание"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Боковая панель"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Ссылки"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Расширенный"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Особый CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Использовать значения по умолчанию"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Восстановить оформление по умолчанию"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Восстановить значения по умолчанию"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Сохранить"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Сохранить оформление"
@@ -1337,7 +1337,7 @@ msgstr "Обратный вызов слишком длинный."
msgid "Callback URL is not valid."
msgstr "URL-адрес обратного вызова недействителен."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Не удаётся обновить приложение."
@@ -1430,7 +1430,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Отмена"
@@ -1907,6 +1907,12 @@ msgstr "Настройки"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Заблокировать"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1917,13 +1923,13 @@ msgstr "Сделать пользователя администратором
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Сделать администратором"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Сделать этого пользователя администратором"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -2357,6 +2363,110 @@ msgstr "Вы не являетесь членом этой группы."
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Вы уже авторизовались."
@@ -2593,8 +2703,8 @@ msgid "Connected applications"
msgstr "Подключённые приложения"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Вы разрешили доступ к учётной записи следующим приложениям."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2617,7 +2727,7 @@ msgstr "Разработчики могут изменять настройки
msgid "Notice has no profile."
msgstr "Уведомление не имеет профиля."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "Статус %1$s на %2$s"
@@ -2783,8 +2893,8 @@ msgid "Paths"
msgstr "Пути"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Настройки путей и серверов для этого сайта StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3637,8 +3747,8 @@ msgid "Sessions"
msgstr "Сессии"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Настройки сессии для этого сайта StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3657,7 +3767,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Включить отладочный вывод для сессий."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Сохранить настройки сайта"
@@ -4581,75 +4690,79 @@ msgstr ""
"Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Пользователь"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Настройки пользователя для этого сайта StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Неверное ограничение биографии. Должно быть числом."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
"Неверный текст приветствия. Максимальная длина составляет 255 символов."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профиль"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Ограничение биографии"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Максимальная длина биографии профиля в символах."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Новые пользователи"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Приветствие новым пользователям"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Подписка по умолчанию"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Автоматически подписывать новых пользователей на этого пользователя."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Приглашения"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Приглашения включены"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Разрешать ли пользователям приглашать новых пользователей."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизовать подписку"
@@ -4664,7 +4777,9 @@ msgstr ""
"подписаться на записи этого пользователя. Если Вы этого не хотите делать, "
"нажмите «Отказ»."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Лицензия"
@@ -4862,6 +4977,15 @@ msgstr "Версия"
msgid "Author(s)"
msgstr "Автор(ы)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Пометить"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4918,6 +5042,17 @@ msgstr "Не является частью группы."
msgid "Group leave failed."
msgstr "Не удаётся покинуть группу."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Присоединиться"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -5002,18 +5137,18 @@ msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Для saveKnownGroups указан неверный тип"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5041,7 +5176,7 @@ msgid "Missing profile."
msgstr "Отсутствующий профиль."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Не удаётся сохранить тег."
@@ -5080,9 +5215,18 @@ msgstr "Не удаётся удалить подписочный жетон OMB
msgid "Could not delete subscription."
msgstr "Не удаётся удалить подписку."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
@@ -5405,19 +5549,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Туда"
@@ -5525,6 +5669,11 @@ msgstr "Изменить уведомление сайта"
msgid "Snapshots configuration"
msgstr "Конфигурация снимков"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5535,33 +5684,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 "Нет приложения для этого пользовательского ключа."
#. TRANS: OAuth exception given when an incorrect access token was given for a user.
#: lib/apiauth.php:212
msgid "Bad access token."
-msgstr ""
+msgstr "Неверный ключ доступа."
#. 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 "Нет пользователя для этого ключа."
#. 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 "Не удаётся произвести аутентификацию."
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "Попытка отменить неизвестный ключ."
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "Не удаётся удалить аннулированный ключ."
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5610,38 +5759,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL для перенаправления после проверки подлинности"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Браузер"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Операционная система"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Среда выполнения приложения: браузер или операционная система"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Только чтение"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Чтение и запись"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Доступ по умолчанию для этого приложения: только чтение или чтение и запись"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Отменить"
@@ -6141,10 +6290,6 @@ msgstr "Мне не нравится эта запись"
msgid "Favor this notice"
msgstr "Мне нравится эта запись"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Пометить"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6162,8 +6307,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Экспорт потока записей"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6223,7 +6368,7 @@ msgstr ""
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Группа"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6231,13 +6376,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "Группа %s"
#. TRANS: Menu item in the group navigation page.
#: 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.
@@ -6245,13 +6390,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Участники группы %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Заблокированные"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6259,7 +6404,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "Заблокированные пользователи %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6267,13 +6412,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Редактировать свойства группы %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Логотип"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6281,7 +6426,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Добавить или изменить логотип группы %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6289,7 +6434,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Добавить или изменить оформление %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6357,10 +6502,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Неизвестный источник входящих сообщений %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Присоединиться"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Покинуть"
@@ -7051,7 +7192,7 @@ msgstr "Повторить эту запись"
msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Ни задан пользователь для однопользовательского режима."
@@ -7279,17 +7420,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "пару секунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -7298,12 +7439,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "около часа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -7312,12 +7453,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "около дня назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -7326,12 +7467,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "около месяца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -7340,7 +7481,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "около года назад"
@@ -7355,3 +7496,17 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
"символов."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index fddbf065c..c57c3f5e8 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:24+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:38+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Spara inställningar för åtkomst"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Spara"
@@ -685,7 +685,7 @@ msgstr "Hittades inte."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Format som inte stödjs."
@@ -881,9 +881,8 @@ msgid "Yes"
msgstr "Ja"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Blockera denna användare"
@@ -1020,7 +1019,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -1121,56 +1120,56 @@ msgid "Design"
msgstr "Utseende"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Utseendeinställningar för denna StatusNet-webbplats."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Ogiltig webbadress för logtyp."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Tema inte tillgängligt: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Byt logotyp"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Webbplatslogotyp"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Byt tema"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Webbplatstema"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Tema för webbplatsen."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Anpassat tema"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
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:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Ändra bakgrundsbild"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Bakgrund"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1180,75 +1179,76 @@ msgstr ""
"filstorleken är %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "På"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Av"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Sätt på eller stäng av bakgrundsbild."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Upprepa bakgrundsbild"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Byt färger"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Innehåll"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Sidofält"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Text"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Länkar"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Avancerat"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Anpassad CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "Använd standardvärden"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Återställ standardutseende"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Återställ till standardvärde"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Spara"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Spara utseende"
@@ -1326,7 +1326,7 @@ msgstr "Anrop är för lång."
msgid "Callback URL is not valid."
msgstr "Webbadress för anrop är inte giltig."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Kunde inte uppdatera applikation."
@@ -1419,7 +1419,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
@@ -1886,6 +1886,12 @@ msgstr "Administratör"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Blockera"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1896,13 +1902,13 @@ msgstr "Gör användare till en administratör för gruppen"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "Gör till administratör"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Gör denna användare till administratör"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
@@ -2335,6 +2341,110 @@ msgstr "Du är inte en medlem i den gruppen."
msgid "%1$s left group %2$s"
msgstr "%1$s lämnade grupp %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Redan inloggad."
@@ -2572,8 +2682,8 @@ msgid "Connected applications"
msgstr "Anslutna applikationer"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "Du har tillåtit följande applikationer att komma åt ditt konto."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2597,7 +2707,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Notisen har ingen profil."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$ss status den %2$s"
@@ -2761,8 +2871,8 @@ msgid "Paths"
msgstr "Sökvägar"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Sökvägs- och serverinställningar för denna StatusNet-webbplats."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3619,8 +3729,8 @@ msgid "Sessions"
msgstr "Sessioner"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Sessionsinställningar för denna StatusNet-webbplats."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3639,7 +3749,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Sätt på felsökningsutdata för sessioner."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Spara webbplatsinställningar"
@@ -4555,76 +4664,80 @@ msgstr ""
"2$s'."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Användare"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Användarinställningar för denna StatusNet-webbplats"
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Ogiltig begränsning av biografi. Måste vara numerisk."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Begränsning av biografi"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Maximal teckenlängd av profilbiografi."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Nya användare"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Välkomnande av ny användare"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Välkomsttext för nya användare (max 255 tecken)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Standardprenumerationer"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr ""
"Lägg automatiskt till en prenumeration på denna användare för alla nya "
"användare."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Inbjudningar"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Inbjudningar aktiverade"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Godkänn prenumeration"
@@ -4639,7 +4752,9 @@ msgstr ""
"prenumerera på den här användarens notiser. Om du inte bett att prenumerera "
"på någons meddelanden, klicka på \"Avvisa\"."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Licens"
@@ -4838,6 +4953,15 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Författare"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Markera som favorit"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4894,6 +5018,17 @@ msgstr "Inte med i grupp."
msgid "Group leave failed."
msgstr "Grupputträde misslyckades."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Gå med"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4978,18 +5113,18 @@ msgid "Problem saving notice."
msgstr "Problem med att spara notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Dålig typ tillhandahållen saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5014,7 +5149,7 @@ msgid "Missing profile."
msgstr "Saknar profil."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Kunde inte spara tagg."
@@ -5053,9 +5188,18 @@ msgstr "Kunde inte spara prenumeration."
msgid "Could not delete subscription."
msgstr "Kunde inte spara prenumeration."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Välkommen till %1$s, @%2$s!"
@@ -5375,19 +5519,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Tidigare"
@@ -5495,6 +5639,11 @@ msgstr "Redigera webbplatsnotis"
msgid "Snapshots configuration"
msgstr "Konfiguration av ögonblicksbilder"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5579,38 +5728,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL att omdirigera till efter autentisering"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Webbläsare"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Skrivbord"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Typ av applikation, webbläsare eller skrivbord"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Skrivskyddad"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Läs och skriv"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
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:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Avbryt"
@@ -6105,10 +6254,6 @@ msgstr "Avmarkera denna notis som favorit"
msgid "Favor this notice"
msgstr "Markera denna notis som favorit"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Markera som favorit"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6126,8 +6271,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportdata"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6185,7 +6330,7 @@ msgstr "Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d"
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Grupp"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6193,13 +6338,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "%s grupp"
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Medlemmar"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -6207,13 +6352,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "%s gruppmedlemmar"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Blockerade"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6221,7 +6366,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "%s blockerade användare"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6229,13 +6374,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Redigera %s gruppegenskaper"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Logotyp"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6243,7 +6388,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Lägg till eller redigera %s logotyp"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -6251,7 +6396,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Lägg till eller redigera %s utseende"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6319,10 +6464,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Okänd källa för inkorg %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Gå med"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Lämna"
@@ -6753,13 +6894,15 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"\"%1$s\" är en filtyp som saknar stöd på denna server. Prova att använda ett "
+"annat %2$s-format."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
#: lib/mediafile.php:345
#, php-format
msgid "\"%s\" is not a supported file type on this server."
-msgstr ""
+msgstr "%s är en filtyp som saknar stöd på denna server."
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6878,20 +7021,20 @@ msgstr "Skicka en knuff till denna användare"
#: lib/oauthstore.php:283
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Fel vid infogning av ny profil."
#: lib/oauthstore.php:291
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Fel vid infogning av avatar."
#: lib/oauthstore.php:311
msgid "Error inserting remote profile."
-msgstr ""
+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
msgid "Duplicate notice."
-msgstr ""
+msgstr "Duplicera notis."
#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
@@ -7013,7 +7156,7 @@ msgstr "Upprepa denna notis"
msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Ingen enskild användare definierad för enanvändarläge."
@@ -7039,7 +7182,7 @@ msgstr "Nyckelord"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Sök"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -7240,64 +7383,64 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -7310,3 +7453,17 @@ msgstr "%s är inte en giltig färg!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index f35ee97fa..8c79de054 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:25+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:39+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "భద్రపరచు"
@@ -610,7 +610,7 @@ msgstr "కనబడలేదు."
msgid "Max notice size is %d chars, including attachment URL."
msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr ""
@@ -779,9 +779,8 @@ msgid "Yes"
msgstr "అవును"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "ఈ వాడుకరిని నిరోధించు"
@@ -917,7 +916,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
@@ -1015,52 +1014,52 @@ msgid "Design"
msgstr "రూపురేఖలు"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "ఈ స్టేటస్&zwnj;నెట్ సైటుకి రూపురేఖల అమరికలు."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "చిహ్నపు URL చెల్లదు."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "అలంకారం అందుబాటులో లేదు: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "చిహ్నాన్ని మార్చు"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "సైటు చిహ్నం"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "అలంకారాన్ని మార్చు"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "సైటు అలంకారం"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "సైటుకి అలంకారం."
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr ""
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "నేపథ్య చిత్రాన్ని మార్చు"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "నేపథ్యం"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1068,59 +1067,60 @@ msgid ""
msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "ఆన్"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "ఆఫ్"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "రంగులను మార్చు"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "విషయం"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "పక్కపట్టీ"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "పాఠ్యం"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "లంకెలు"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "ఉన్నత"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "ప్రత్యేక CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "అప్రమేయాలని ఉపయోగించు"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "భద్రపరచు"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "రూపురేఖలని భద్రపరచు"
@@ -1190,7 +1190,7 @@ msgstr ""
msgid "Callback URL is not valid."
msgstr ""
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "ఉపకరణాన్ని తాజాకరించలేకున్నాం."
@@ -1283,7 +1283,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "రద్దుచేయి"
@@ -1650,6 +1650,12 @@ msgstr "నిర్వాహకులు"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "నిరోధించు"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -2054,6 +2060,110 @@ msgstr "మీరు ఆ గుంపులో సభ్యులు కాద
msgid "%1$s left group %2$s"
msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
@@ -2271,8 +2381,8 @@ msgid "Connected applications"
msgstr "సంధానిత ఉపకరణాలు"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "మీ ఖాతాని ప్రాపించడానికి మీరు ఈ క్రింది ఉపకరణాలకి అనుమతినిచ్చారు."
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2295,7 +2405,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "నోటీసుకి ప్రొఫైలు లేదు."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%2$sలో %1$s యొక్క స్థితి"
@@ -2426,6 +2536,10 @@ msgstr "సంకేతపదం భద్రమయ్యింది."
msgid "Paths"
msgstr "త్రోవలు"
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
+
#: actions/pathsadminpanel.php:157
#, php-format
msgid "Theme directory not readable: %s."
@@ -3126,6 +3240,10 @@ msgstr "స్టేటస్‌నెట్"
msgid "You cannot sandbox users on this site."
msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
+#: actions/sessionsadminpanel.php:65
+msgid "Session settings for this StatusNet site"
+msgstr ""
+
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
msgstr ""
@@ -3139,7 +3257,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "సైటు అమరికలను భద్రపరచు"
@@ -3839,70 +3956,74 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "వాడుకరి"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "ఈ స్టేటస్&zwnj;నెట్ సైటుకి వాడుకరి అమరికలు."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "ప్రొఫైలు"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "స్వపరిచయ పరిమితి"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "స్వపరిచయం యొక్క గరిష్ఠ పొడవు, అక్షరాలలో."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "కొత్త వాడుకరులు"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "కొత్త వాడుకరి స్వాగతం"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "అప్రమేయ చందా"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "ఆహ్వానాలు"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "ఆహ్వానాలని చేతనంచేసాం"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "చందాని అధీకరించండి"
@@ -3914,7 +4035,9 @@ msgid ""
"click “Reject”."
msgstr ""
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "లైసెన్సు"
@@ -4062,6 +4185,15 @@ msgstr "సంచిక"
msgid "Author(s)"
msgstr "రచయిత(లు)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "ఇష్టపడు"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4116,6 +4248,17 @@ msgstr "గుంపులో భాగం కాదు."
msgid "Group leave failed."
msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "చేరు"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4166,13 +4309,13 @@ msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4192,7 +4335,7 @@ msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
@@ -4226,9 +4369,18 @@ msgstr "కొత్త చందాని చేర్చలేకపోయా
msgid "Could not delete subscription."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
@@ -4536,19 +4688,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "ఇంతక్రితం"
@@ -4640,6 +4792,11 @@ msgstr "సైటు గమనికని భద్రపరచు"
msgid "Snapshots configuration"
msgstr "వాడుకరి స్వరూపణం"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -4718,37 +4875,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "విహారిణి"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "మేజోపరి"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "ఉపకరణ రకం, విహారిణి లేదా మేజోపరి"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "చదవడం-మాత్రమే"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "చదవడం-వ్రాయడం"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "రద్దుచేయి"
@@ -5112,10 +5269,6 @@ msgstr ""
msgid "Favor this notice"
msgstr "ఈ నోటీసుని పునరావృతించు"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "ఇష్టపడు"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr ""
@@ -5133,8 +5286,8 @@ msgid "FOAF"
msgstr ""
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "భోగట్టా ఎగుమతి"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5238,7 +5391,7 @@ msgstr ""
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "చిహ్నం"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -5312,10 +5465,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "గుర్తు తెలియని భాష \"%s\"."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "చేరు"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "వైదొలగు"
@@ -5945,7 +6094,7 @@ msgstr "అవును"
msgid "Repeat this notice"
msgstr "ఈ నోటీసుని పునరావృతించు"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -5967,7 +6116,7 @@ msgstr "కీపదము(లు)"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "వెతుకు"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -6155,64 +6304,64 @@ msgid "Moderator"
msgstr "సమన్వయకర్త"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
+msgstr[1] "సుమారు %d నిమిషాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక గంట"
+msgstr[1] "%d గంటల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక రోజు"
+msgstr[1] "%d రోజుల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ఒక నెల"
+msgstr[1] "%d నెలల"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -6225,3 +6374,17 @@ msgstr "%s అనేది సరైన రంగు కాదు!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 1664f062d..f37130532 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
# Expored from translatewiki.net
#
# Author: Joseph
+# Author: Maidis
# Author: McDutchie
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,42 +11,81 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:27+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:40+0000\n"
"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
+
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
+msgid "Access"
+msgstr "Erişim"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
msgid "Site access settings"
msgstr "Profil ayarları"
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161
+msgid "Registration"
+msgstr "Kayıt"
+
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
+"Anonim kullanıcıların (giriş yapmayanların) siteyi görmesi engellensin mi?"
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#: actions/accessadminpanel.php:167
+msgctxt "LABEL"
+msgid "Private"
+msgstr "Özel"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Sadece kayıt daveti yap."
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
msgid "Invite only"
-msgstr ""
+msgstr "Sadece davet"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr ""
+msgstr "Yeni kayıtları devre dışı bırak."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
+msgid "Closed"
+msgstr "Kapalı"
+
+#. TRANS: Title / tooltip for button to save access settings in site admin panel
+#: actions/accessadminpanel.php:202
+msgid "Save access settings"
+msgstr "Erişim ayarlarını kaydet"
+
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:354
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Kaydet"
#. TRANS: Server error when page not found (404)
#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
@@ -78,6 +118,12 @@ msgstr "Böyle bir kullanıcı yok."
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:90
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s ve arkadaşları, sayfa %2$d"
+
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
@@ -89,11 +135,31 @@ msgid "%s and friends"
msgstr "%s ve arkadaşları"
#. TRANS: %1$s is user nickname
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s ve arkadaşları için besleme (RSS 1.0)"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:116
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s ve arkadaşları için besleme (RSS 2.0)"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:125
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s ve arkadaşları için besleme (Atom)"
+
+#. TRANS: %1$s is user nickname
#: actions/all.php:138
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
+"Bu, %s ve arkadaşlarının zaman çizelgesi ama henüz hiç kimse bir şey "
+"göndermemiş."
#: actions/all.php:143
#, php-format
@@ -117,6 +183,11 @@ msgid ""
"post a notice to them."
msgstr ""
+#. TRANS: H1 text
+#: actions/all.php:182
+msgid "You and friends"
+msgstr "Sen ve arkadaşların"
+
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
#: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -177,52 +248,78 @@ msgstr ""
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings."
-msgstr ""
+msgstr "Dizayn ayarlarınız kaydedilemedi."
+
+#: actions/apiblockcreate.php:106
+msgid "You cannot block yourself!"
+msgstr "Kendinizi engelleyemezsiniz!"
#: actions/apiblockcreate.php:127
msgid "Block user failed."
-msgstr ""
+msgstr "Kullanıcıyı engelleme başarısız oldu."
#: actions/apiblockdestroy.php:115
msgid "Unblock user failed."
-msgstr ""
+msgstr "Kullanıcının engellemesini kaldırma başarısız oldu."
#: actions/apidirectmessage.php:89
#, php-format
msgid "Direct messages from %s"
-msgstr ""
+msgstr "%s kullanıcısından özel mesajlar"
#: actions/apidirectmessage.php:93
#, php-format
msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "%s tarafından gönderilmiş tüm özel mesajlar"
#: actions/apidirectmessage.php:101
#, php-format
msgid "Direct messages to %s"
-msgstr ""
+msgstr "%s kullanıcısına özel mesaj"
#: actions/apidirectmessage.php:105
#, php-format
msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "%s kullanıcısına gönderilmiş tüm özel mesajlar"
#: actions/apidirectmessagenew.php:119
msgid "No message text!"
-msgstr ""
+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:139
+msgid "Recipient user not found."
+msgstr "Alıcı kullanıcı bulunamadı."
#: actions/apidirectmessagenew.php:143
msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+msgstr "Arkadaşınız olmayan kullanıcılara özel mesaj gönderemezsiniz."
#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
-msgstr ""
+msgstr "Bu ID'ye sahip durum mesajı bulunamadı."
+
+#: actions/apifavoritecreate.php:121
+msgid "This status is already a favorite."
+msgstr "Bu durum mesajı zaten bir favori."
+
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
+msgid "Could not create favorite."
+msgstr "Favori oluşturulamadı."
#: actions/apifavoritedestroy.php:124
msgid "That status is not a favorite."
-msgstr ""
+msgstr "Bu durum mesajı bir favori değil."
+
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Favori silinemedi."
#: actions/apifriendshipscreate.php:110
msgid "Could not follow user: profile not found."
@@ -231,11 +328,27 @@ msgstr "Profil kaydedilemedi."
#: actions/apifriendshipscreate.php:119
#, php-format
msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "Kullanıcı izlenemiyor: %s zaten listenizde."
+
+#: actions/apifriendshipsdestroy.php:110
+msgid "Could not unfollow user: User not found."
+msgstr "Kullanıcı izlemesi bırakılamıyor: Kullanıcı bulunamadı."
+
+#: actions/apifriendshipsdestroy.php:121
+msgid "You cannot unfollow yourself."
+msgstr "Kendinizi izlemeyi bırakamazsınız."
#: actions/apifriendshipsexists.php:91
msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
+msgstr "İki geçerli ID ya da screen_names verilmelidir."
+
+#: actions/apifriendshipsshow.php:134
+msgid "Could not determine source user."
+msgstr "Kaynak kullanıcı belirlenemedi."
+
+#: actions/apifriendshipsshow.php:142
+msgid "Could not find target user."
+msgstr "Hedef kullanıcı bulunamadı."
#: actions/apigroupcreate.php:168 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -312,19 +425,41 @@ msgstr "Bize o profili yollamadınız"
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Bu gruptan yönetici tarafından engellendiniz."
+
+#: actions/apigroupleave.php:116
+msgid "You are not a member of this group."
+msgstr "Bu grubun bir üyesi değilsiniz."
+
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: lib/command.php:401
+#, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "%1$s kullanıcısı, %2$s grubundan silinemedi."
+
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:98
+#, php-format
+msgid "%s's groups"
+msgstr "%s kullanıcısının 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.
#: actions/apigrouplistall.php:92 actions/usergroups.php:63
#, php-format
msgid "%s groups"
-msgstr ""
+msgstr "%s grupları"
#: actions/apigrouplistall.php:96
#, php-format
msgid "groups on %s"
-msgstr ""
+msgstr "%s üzerindeki gruplar"
+
+#: actions/apimediaupload.php:100
+msgid "Upload failed."
+msgstr "Yükleme başarısız."
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
@@ -348,6 +483,10 @@ msgstr ""
msgid "There was a problem with your session token. Try again, please."
msgstr ""
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Geçersiz kullanıcı adı / parola!"
+
#: actions/apioauthauthorize.php:214
#, php-format
msgid ""
@@ -388,6 +527,11 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:463
+msgid "Account"
+msgstr "Hesap"
+
#: actions/apioauthauthorize.php:313 actions/login.php:252
#: actions/profilesettings.php:106 actions/register.php:431
#: actions/showgroup.php:245 actions/tagother.php:94
@@ -404,11 +548,11 @@ msgstr "Parola"
#: actions/apioauthauthorize.php:328
msgid "Deny"
-msgstr ""
+msgstr "Reddet"
#: actions/apioauthauthorize.php:334
msgid "Allow"
-msgstr ""
+msgstr "İzin Ver"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
@@ -420,31 +564,65 @@ msgstr ""
#: actions/apistatusesdestroy.php:135
msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
msgstr "Böyle bir durum mesajı yok."
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:84 lib/command.php:538
+msgid "Cannot repeat your own notice."
+msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
+
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:92 lib/command.php:544
+msgid "Already repeated that notice."
+msgstr "Bu durum mesajı zaten tekrarlanmış."
+
+#: actions/apistatusesshow.php:139
+msgid "Status deleted."
+msgstr "Durum silindi."
+
#: actions/apistatusesshow.php:145
msgid "No status with that ID found."
-msgstr ""
+msgstr "Bu ID'li bir durum mesajı bulunamadı."
#: actions/apistatusesupdate.php:222
msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "İstemci, bir değere sahip 'status' parametresi sağlamalı."
+
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
+#: lib/mailhandler.php:60
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
+
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Bulunamadı."
#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
+"Maksimum durum mesajı boyutu, eklenti bağlantıları dahil %d karakterdir."
+
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
+msgid "Unsupported format."
+msgstr "Desteklenmeyen biçim."
#: actions/apitimelinementions.php:131
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s genel zaman çizelgesi"
+
#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
@@ -455,6 +633,10 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr "UPA metodu yapım aşamasında."
+
#: actions/attachment.php:73
msgid "No such attachment."
msgstr "Böyle bir durum mesajı yok."
@@ -466,6 +648,10 @@ msgstr "Böyle bir durum mesajı yok."
msgid "No nickname."
msgstr "Takma ad yok"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "Boyut yok."
+
#: actions/avatarbynickname.php:69
msgid "Invalid size."
msgstr "Geçersiz büyüklük."
@@ -476,6 +662,12 @@ msgstr "Geçersiz büyüklük."
msgid "Avatar"
msgstr "Avatar"
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"Kişisel kullanıcı resminizi yükleyebilirsiniz. Maksimum dosya boyutu %s'dir."
+
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
msgid "Avatar settings"
@@ -484,17 +676,17 @@ msgstr "Profil ayarları"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
-msgstr ""
+msgstr "Orijinal"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
#: actions/grouplogo.php:213 actions/grouplogo.php:274
msgid "Preview"
-msgstr ""
+msgstr "Önizleme"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
#: lib/deleteuserform.php:66 lib/noticelist.php:657
msgid "Delete"
-msgstr ""
+msgstr "Sil"
#: actions/avatarsettings.php:166 actions/grouplogo.php:236
msgid "Upload"
@@ -502,11 +694,15 @@ msgstr "Yükle"
#: actions/avatarsettings.php:231 actions/grouplogo.php:289
msgid "Crop"
-msgstr ""
+msgstr "Kırp"
+
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Hiçbir dosya yüklenmedi."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
@@ -520,16 +716,46 @@ msgstr "Avatar güncellendi."
msgid "Failed updating avatar."
msgstr "Avatar güncellemede hata."
+#: actions/avatarsettings.php:397
+msgid "Avatar deleted."
+msgstr "Kullanıcı resmi silindi."
+
#: actions/block.php:69
msgid "You already blocked that user."
msgstr "Jabber ID başka bir kullanıcıya ait."
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+msgid "Block user"
+msgstr "Kullanıcıyı engelle"
+
#: actions/block.php:138
msgid ""
"Are you sure you want to block this user? Afterwards, they will be "
"unsubscribed from you, unable to subscribe to you in the future, and you "
"will not be notified of any @-replies from them."
msgstr ""
+"Bu kullanıcıyı engellemek istediğinizden emin misiniz? Daha sonra, bu "
+"kullanıcıların size olan abonelikleri sonlandırılacak ve gelecekte de size "
+"bir daha abone olamayacaklar, ayrıca siz de onlardan gelen hiçbir @-"
+"cevaplama'dan haberdar edilmeyeceksiniz."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:153 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Hayır"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:157 actions/deleteuser.php:156
+msgid "Do not block this user"
+msgstr "Bu kullanıcıyı engelleme"
#. TRANS: Button label on the user block form.
#. TRANS: Button label on the delete application form.
@@ -541,11 +767,17 @@ msgstr ""
#: actions/groupblock.php:185
msgctxt "BUTTON"
msgid "Yes"
-msgstr ""
+msgstr "Evet"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 lib/blockform.php:82
+msgid "Block this user"
+msgstr "Bu kullanıcıyı engelle"
#: actions/block.php:187
msgid "Failed to save block information."
-msgstr ""
+msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
#. 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.
@@ -563,14 +795,28 @@ msgstr ""
msgid "No such group."
msgstr "Böyle bir kullanıcı yok."
+#: actions/blockedfromgroup.php:97
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s engellenmiş profil"
+
#: actions/blockedfromgroup.php:115
msgid "A list of the users blocked from joining this group."
-msgstr ""
+msgstr "Bu gruba katılması engellenmiş kullanıcıların bir listesi."
+
+#: actions/blockedfromgroup.php:288
+msgid "Unblock user from group"
+msgstr "Kullanıcının gruba üye olma engellemesini kaldır"
#. TRANS: Title for the form to unblock a user.
#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
msgid "Unblock"
-msgstr ""
+msgstr "Engellemeyi Kaldır"
+
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
+msgid "Unblock this user"
+msgstr "Bu kullanıcının engellemesini kaldır"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -584,6 +830,12 @@ msgstr "Onay kodu bulunamadı."
msgid "That confirmation code is not for you!"
msgstr "O onay kodu sizin için değil!"
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "Tanınmayan adres türü %s."
+
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
msgid "That address has already been confirmed."
@@ -619,28 +871,58 @@ msgstr "Onayla"
msgid "The address \"%s\" has been confirmed for your account."
msgstr "\"%s\" adresi hesabınız için onaylandı."
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Konuşma"
+
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "Durum mesajları"
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Bir uygulamayı silmek için giriş yapmış olmanız gerekir."
+
#: actions/deleteapplication.php:71
msgid "Application not found."
msgstr "Onay kodu bulunamadı."
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr ""
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Uygulamayı sil"
+
#: actions/deleteapplication.php:149
msgid ""
"Are you sure you want to delete this application? This will clear all data "
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"Bu uygulamayı silmek istediğinizden emin misiniz? Bu, veritabanından varolan "
+"kullanıcı bağlantıları dahil olmak üzere uygulamaya ait tüm verileri "
+"temizleyecektir."
+
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
+msgid "Do not delete this application"
+msgstr "Bu uygulamayı silme"
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
+msgid "Delete this application"
+msgstr "Bu uygulamayı sil"
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -653,143 +935,241 @@ msgstr ""
msgid "Not logged in."
msgstr "Giriş yapılmadı."
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Bu durum mesajı silinemiyor."
+
#: actions/deletenotice.php:103
msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
+"Bir durum mesajını kalıcı olarak silmek üzeresiniz. Bu bir kez yapıldığında, "
+"geri alınamaz."
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Durum mesajını sil"
#: actions/deletenotice.php:144
msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
+
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
+msgid "Do not delete this notice"
+msgstr "Bu durum mesajını silme"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
#: actions/deletenotice.php:158 lib/noticelist.php:657
msgid "Delete this notice"
-msgstr ""
+msgstr "Bu durum mesajını sil"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "Kullanıcıları silemezsiniz."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "Sadece yerel kullanıcıları silebilirsiniz."
#: actions/deleteuser.php:110 actions/deleteuser.php:133
msgid "Delete user"
-msgstr ""
+msgstr "Kullanıcıyı sil"
#: actions/deleteuser.php:136
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"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 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Bu kullanıcıyı sil"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
msgid "Design"
-msgstr ""
+msgstr "Dizayn"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr ""
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:331
+msgid "Invalid logo URL."
+msgstr "Geçersiz logo bağlantısı."
+
+#: actions/designadminpanel.php:335
+#, php-format
+msgid "Theme not available: %s."
+msgstr "Tema mevcut değil: %s"
+
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Değiştir"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:444
+msgid "Site logo"
+msgstr "Site logosu"
+
+#: actions/designadminpanel.php:456
+msgid "Change theme"
+msgstr "Temayı değiştir"
+
+#: actions/designadminpanel.php:473
+msgid "Site theme"
+msgstr "Site teması"
+
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
-msgstr ""
+msgstr "Site için tema."
+
+#: actions/designadminpanel.php:480
+msgid "Custom theme"
+msgstr "Özel tema"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
+msgstr "Özel bir StatusNet temasını .ZIP arşivi olarak yükleyebilirsiniz."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
-msgstr ""
+msgstr "Arkaplan resmini değiştir"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
+msgstr "Arkaplan"
+
+#: actions/designadminpanel.php:509
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
msgstr ""
+"Bu site için arkaplan resmi yükleyebilirsiniz. Maksimum dosya boyutu %1"
+"$s'dir."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
-msgstr ""
+msgstr "Açık"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
-msgstr ""
+msgstr "Kapalı"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
-msgstr ""
+msgstr "Arkaplan resmini açın ya da kapatın."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
-msgstr ""
+msgstr "Arkaplan resmini döşe"
+
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Renkleri değiştir"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
+msgid "Content"
+msgstr "İçerik"
+
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Kenar Çubuğu"
+
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
-msgstr ""
+msgstr "Metin"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
+msgid "Links"
+msgstr "Bağlantılar"
+
+#: actions/designadminpanel.php:664
msgid "Advanced"
-msgstr ""
+msgstr "Gelişmiş"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
-msgstr ""
+msgstr "Özel CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Öntanımlıları kullan"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Öntanımlıya geri dön"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Kaydet"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Dizaynı kaydet"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Bu durum mesajı bir favori değil!"
#: actions/disfavor.php:94
msgid "Add to favorites"
-msgstr ""
+msgstr "Favorilere ekle"
#: actions/doc.php:158
#, php-format
msgid "No such document \"%s\""
msgstr "Böyle bir durum mesajı yok."
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Uygulamayı Düzenle"
+
#: actions/editapplication.php:66
msgid "You must be logged in to edit an application."
-msgstr ""
+msgstr "Bir uygulamayı düzenlemek için giriş yapmış olmanız gerekir."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Böyle bir uygulama yok."
#: actions/editapplication.php:161
msgid "Use this form to edit your application."
-msgstr ""
+msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
#: actions/editapplication.php:177 actions/newapplication.php:159
msgid "Name is required."
-msgstr ""
+msgstr "İsim gereklidir."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "İsim çok uzun (maksimum: 255 karakter)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "İsim halihazırda kullanımda. Başka bir tane deneyin."
#: actions/editapplication.php:186 actions/newapplication.php:168
msgid "Description is required."
@@ -797,15 +1177,23 @@ msgstr "Abonelik reddedildi."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "Kaynak bağlantı çok uzun."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Kaynak bağlantı geçerli değil."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Organizasyon gereklidir."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Organizasyon anasayfası gereklidir."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
@@ -815,40 +1203,68 @@ msgstr ""
msgid "Callback URL is not valid."
msgstr ""
+#: actions/editapplication.php:261
+msgid "Could not update application."
+msgstr "Uygulama güncellenemedi."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
-msgstr ""
+msgstr "%s grubunu düzenle"
#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Bir grup oluşturmak için giriş yapmış olmanız gerekir."
#: actions/editgroup.php:107 actions/editgroup.php:172
#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
msgid "You must be an admin to edit the group."
-msgstr ""
+msgstr "Bir grubu düzenlemek için bir yönetici olmalısınız."
#: actions/editgroup.php:158
msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Grubu düzenlemek için bu biçimi kullan."
#: actions/editgroup.php:205 actions/newgroup.php:145
#, php-format
msgid "description is too long (max %d chars)."
msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
+#: actions/editgroup.php:258
+msgid "Could not update group."
+msgstr "Grup güncellenemedi."
+
#. TRANS: Server exception thrown when creating group aliases failed.
#: actions/editgroup.php:264 classes/User_group.php:514
msgid "Could not create aliases."
msgstr "Kullanıcı güncellenemedi."
+#: actions/editgroup.php:280
+msgid "Options saved."
+msgstr "Seçenekler kaydedildi."
+
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
+msgid "Email settings"
+msgstr "E-posta ayarları"
+
#. TRANS: E-mail settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "%%site.name%%'dan nasıl e-posta alacağınızı yönetin."
+
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-posta adresi"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
+msgid "Current confirmed email address."
+msgstr "Mevcut doğrulanmış e-posta adresi."
#. TRANS: Button label to remove a confirmed e-mail address.
#. TRANS: Button label for removing a set sender e-mail address to post notices from.
@@ -862,6 +1278,24 @@ msgctxt "BUTTON"
msgid "Remove"
msgstr "Geri al"
+#: actions/emailsettings.php:122
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Bu adresten onay bekleniyor. Ayrıntılı bilgi içeren mesaj için gelen "
+"kutunuzu (ve gereksiz e-postalar bölümünü) kontrol edin."
+
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "İptal"
+
#. TRANS: Instructions for e-mail address input form. Do not translate
#. TRANS: "example.org". It is one of the domain names reserved for
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
@@ -869,42 +1303,59 @@ msgstr "Geri al"
#. TRANS: organization.
#: actions/emailsettings.php:139
msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "\"kullanıcıadı@örnek.org\" benzeri bir e-posta adresi."
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Ekle"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
#: actions/emailsettings.php:151 actions/smssettings.php:171
msgid "Incoming email"
-msgstr ""
+msgstr "Gelen e-posta"
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
#: actions/emailsettings.php:159 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
-msgstr ""
+msgstr "Yeni durum mesajları göndermek için bu adrese e-posta atın."
#. TRANS: Instructions for incoming e-mail address input form.
#. TRANS: Instructions for incoming SMS e-mail address input form.
#: actions/emailsettings.php:168 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+"Gönderim yapmak için yeni bir e-posta adresi oluşturun; eskisi iptal "
+"olacaktır."
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
#: actions/emailsettings.php:172 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
-msgstr ""
+msgstr "Yeni"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:178
+msgid "Email preferences"
+msgstr "E-posta tercihleri"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:190
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
+"Biri benim durum mesajımı favori olarak eklediğinde bana e-posta gönder."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:197
msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "Birisi bana özel mesaj attığında bana e-posta gönder."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:203
@@ -943,6 +1394,11 @@ msgstr "Onay kodu eklenemedi."
msgid "No pending confirmation to cancel."
msgstr "İptal etmek için beklenen onay yok."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:428
+msgid "That is the wrong email address."
+msgstr "Bu yanlış e-posta adresi."
+
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:442
msgid "Email confirmation cancelled."
@@ -956,23 +1412,40 @@ msgstr "Eposta adresi zaten var."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:512 actions/smssettings.php:581
msgid "Incoming email address removed."
-msgstr ""
+msgstr "Gelen e-posta adresi silindi."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:536 actions/smssettings.php:605
+msgid "New incoming email address added."
+msgstr "Yeni gelen e-posta adresi eklendi."
#: actions/favor.php:79
msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Bu durum mesajı zaten bir favori!"
#: actions/favor.php:92 lib/disfavorform.php:140
msgid "Disfavor favorite"
-msgstr ""
+msgstr "Favoriliğini kaldır"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Popüler durum mesajları"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Popüler durum mesajları, sayfa %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "Şu an sitedeki en popüler durum mesajları."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
+"Favori durum mesajları bu sayfada görüntülenir ama daha hiç kimse favorilere "
+"eklememiş."
#: actions/favorited.php:153
msgid ""
@@ -991,22 +1464,22 @@ msgstr ""
#: lib/personalgroupnav.php:115
#, php-format
msgid "%s's favorite notices"
-msgstr ""
+msgstr "%s kullanıcısının favori durum mesajları"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
-msgstr ""
+msgstr "Öne çıkan kullanıcılar"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "Öne çıkan kullanıcılar, sayfa %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "%s üzerindeki harika kullanıcılardan bazılarının bir seçkisi"
#: actions/file.php:34
msgid "No notice ID."
@@ -1016,9 +1489,17 @@ msgstr "Böyle bir durum mesajı yok."
msgid "No notice."
msgstr "Böyle bir durum mesajı yok."
+#: actions/file.php:42
+msgid "No attachments."
+msgstr "Ek yok."
+
+#: actions/file.php:51
+msgid "No uploaded attachments."
+msgstr "Yüklenmiş ek yok."
+
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr ""
+msgstr "Bu yanıt beklenmiyordu!"
#: actions/finishremotesubscribe.php:80
msgid "User being listened to does not exist."
@@ -1052,7 +1533,7 @@ msgstr ""
#: actions/makeadmin.php:71 actions/subedit.php:46
#: lib/profileformaction.php:79
msgid "No profile specified."
-msgstr ""
+msgstr "Hiçbir profil belirtilmedi."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
@@ -1087,7 +1568,7 @@ msgstr "JabberID yok."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "Bir grubu düzenlemek için giriş yapmış olmanız gerekir."
#: actions/groupdesignsettings.php:144
msgid "Group design"
@@ -1105,7 +1586,7 @@ msgstr ""
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "Resimden logo olacak bir kare alanı seçin."
#. TRANS: Title of the page showing group members.
#. TRANS: %s is the name of the group.
@@ -1127,12 +1608,18 @@ msgstr ""
#: actions/groupmembers.php:186
msgid "Admin"
-msgstr ""
+msgstr "Yönetici"
#. TRANS: Button text for the form that will block a user from a group.
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
+msgstr "Engelle"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
msgstr ""
#: actions/groupmembers.php:498
@@ -1154,7 +1641,7 @@ msgstr ""
#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
-msgstr ""
+msgstr "Gruplar"
#: actions/groups.php:64
#, php-format
@@ -1414,6 +1901,110 @@ msgstr ""
msgid "You must be logged in to leave a group."
msgstr ""
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Zaten giriş yapılmış."
@@ -1585,7 +2176,7 @@ msgid "Connected applications"
msgstr ""
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
#: actions/oauthconnectionssettings.php:186
@@ -1605,7 +2196,7 @@ msgstr ""
msgid "Notice has no profile."
msgstr "Kullanıcının profili yok."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -1713,7 +2304,7 @@ msgid "Paths"
msgstr ""
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+msgid "Path and server settings for this StatusNet site"
msgstr ""
#: actions/pathsadminpanel.php:183
@@ -2310,7 +2901,7 @@ msgid "Sessions"
msgstr ""
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
msgstr ""
#: actions/sessionsadminpanel.php:175
@@ -2330,7 +2921,6 @@ msgid "Turn on debugging output for sessions."
msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Profil ayarları"
@@ -2826,6 +3416,10 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
+#: actions/subscriptions.php:208
+msgid "Jabber"
+msgstr "Jabber"
+
#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -2838,11 +3432,11 @@ msgstr ""
#: actions/tagother.php:81 actions/userauthorization.php:132
#: lib/userprofile.php:103
msgid "Photo"
-msgstr ""
+msgstr "Fotoğraf"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Kullanıcıyı etiketle"
#: actions/tagother.php:151
msgid ""
@@ -2863,6 +3457,10 @@ msgstr "Profil kaydedilemedi."
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr "Böyle bir etiket yok."
+
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
msgid ""
@@ -2870,69 +3468,75 @@ msgid ""
msgstr ""
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr ""
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Profil"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
-msgstr ""
+msgstr "Yeni kullanıcılar"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
-msgstr ""
+msgstr "Yeni kullanıcı karşılaması"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Yeni kullanıcılar için hoşgeldiniz metni (En fazla 255 karakter)."
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr ""
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Takip isteğini onayla"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
-msgstr ""
+msgstr "Lisans"
#: actions/userauthorization.php:217
msgid "Accept"
@@ -3032,6 +3636,11 @@ msgstr ""
msgid "Updates from %1$s on %2$s!"
msgstr ""
+#: actions/version.php:75
+#, php-format
+msgid "StatusNet %s"
+msgstr "StatusNet %s"
+
#: actions/version.php:155
#, php-format
msgid ""
@@ -3068,12 +3677,26 @@ msgstr ""
#: actions/version.php:191
msgid "Plugins"
-msgstr ""
+msgstr "Eklentiler"
+
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:805
+msgid "Version"
+msgstr "Sürüm"
#: actions/version.php:199
msgid "Author(s)"
msgstr ""
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -3108,6 +3731,18 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:248 classes/File.php:263
+msgid "Invalid filename."
+msgstr "Geçersiz dosya ismi."
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
#: classes/Memcached_DataObject.php:533
msgid "No database name or DSN found anywhere."
@@ -3156,13 +3791,13 @@ msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3201,9 +3836,18 @@ msgstr "Yeni abonelik eklenemedi."
msgid "Could not delete subscription."
msgstr "Yeni abonelik eklenemedi."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -3259,11 +3903,23 @@ msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr ""
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:460
+msgctxt "TOOLTIP"
+msgid "Change your email, avatar, password, profile"
+msgstr "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
+
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
#: lib/action.php:468
msgid "Connect"
msgstr "Bağlan"
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:471
+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:474 lib/groupnav.php:117
@@ -3278,23 +3934,62 @@ 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:481
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Davet et"
+
#. TRANS: Tooltip for main menu option "Logout"
#: lib/action.php:487
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr ""
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:495
+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:498
+msgctxt "MENU"
+msgid "Register"
+msgstr "Kayıt"
+
#. TRANS: Tooltip for main menu option "Login"
#: lib/action.php:501
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr ""
+msgstr "Siteye giriş"
+
+#: lib/action.php:504
+msgctxt "MENU"
+msgid "Login"
+msgstr "Giriş"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:507
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Bana yardım et!"
+
+#: lib/action.php:510
+msgctxt "MENU"
+msgid "Help"
+msgstr "Yardım"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:513
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr ""
+msgstr "Kişi ya da yazılar için arama yap"
+
+#: lib/action.php:516
+msgctxt "MENU"
+msgid "Search"
+msgstr "Ara"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:605
@@ -3343,7 +4038,7 @@ msgstr ""
#. TRANS: DT element for StatusNet software license.
#: lib/action.php:839
msgid "StatusNet software license"
-msgstr ""
+msgstr "StatusNet yazılım lisansı"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:849
@@ -3366,6 +4061,11 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:872
+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:879
@@ -3393,10 +4093,22 @@ 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:1243
+#: lib/action.php:1248
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:1259
+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:1269
+msgid "Before"
+msgstr "Önce"
+
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
#: lib/activity.php:122
msgid "Expecting a root feed element but got a whole XML document."
@@ -3430,18 +4142,41 @@ msgstr ""
#. TRANS: Client error message.
#: lib/adminpanelaction.php:222
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() gerçeklenmemiş."
#. TRANS: Client error message
#: lib/adminpanelaction.php:250
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() gerçeklenmemiş."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:274
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Dizayn ayarı silinemedi."
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+msgid "Basic site configuration"
+msgstr "Temel site yapılandırması"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:339
+msgctxt "MENU"
+msgid "Site"
+msgstr "Site"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+msgid "Design configuration"
+msgstr "Dizayn yapılandırması"
+
+#. TRANS: Menu item for site administration
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+msgctxt "MENU"
+msgid "Design"
+msgstr "Dizayn"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:353
@@ -3451,6 +4186,26 @@ msgstr "Onay kodu yok."
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
msgid "User"
+msgstr "Kullanıcı"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+msgid "Access configuration"
+msgstr "Erişim yapılandırması"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+msgid "Paths configuration"
+msgstr "Yol yapılandırması"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+msgid "Edit site notice"
+msgstr "Site durum mesajını düzenle"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
msgstr ""
#. TRANS: Client error 401.
@@ -3492,12 +4247,12 @@ msgstr ""
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
msgid "Edit application"
-msgstr ""
+msgstr "Uygulamayı düzenle"
#. TRANS: Form guide.
#: lib/applicationeditform.php:178
msgid "Icon for this application"
-msgstr ""
+msgstr "Bu uygulama için simge"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
@@ -3510,37 +4265,37 @@ msgid "URL to redirect to after authentication"
msgstr ""
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
-msgstr ""
+msgstr "Tarayıcı"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr ""
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr ""
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "İptal et"
@@ -3576,6 +4331,11 @@ msgstr ""
msgid "Author"
msgstr ""
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279
+msgid "Provider"
+msgstr "Sağlayıcı"
+
#. TRANS: Title.
#: lib/attachmentnoticesection.php:68
msgid "Notices where this attachment appears"
@@ -3589,7 +4349,7 @@ msgstr ""
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:70
msgid "Block"
-msgstr ""
+msgstr "Engelle"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
@@ -3663,6 +4423,25 @@ msgstr ""
msgid "%1$s left group %2$s."
msgstr ""
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:434
+#, php-format
+msgid "Fullname: %s"
+msgstr "Tam İsim: %s"
+
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:438 lib/mail.php:268
+#, php-format
+msgid "Location: %s"
+msgstr "Yer: %s"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:446
+#, php-format
+msgid "About: %s"
+msgstr "Hakkında: %s"
+
#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
#: lib/command.php:474
#, php-format
@@ -3857,28 +4636,24 @@ msgstr ""
msgid "Disfavor this notice"
msgstr ""
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
+msgid "Feeds"
msgstr ""
#: lib/galleryaction.php:121
@@ -4028,11 +4803,11 @@ msgstr ""
#: lib/imagefile.php:244
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:246
msgid "kB"
-msgstr ""
+msgstr "kB"
#: lib/jabber.php:387
#, php-format
@@ -4332,22 +5107,22 @@ msgstr ""
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:436
msgid "N"
-msgstr ""
+msgstr "K"
#. TRANS: Used in coordinates as abbreviation of south
#: lib/noticelist.php:438
msgid "S"
-msgstr ""
+msgstr "G"
#. TRANS: Used in coordinates as abbreviation of east
#: lib/noticelist.php:440
msgid "E"
-msgstr ""
+msgstr "D"
#. TRANS: Used in coordinates as abbreviation of west
#: lib/noticelist.php:442
msgid "W"
-msgstr ""
+msgstr "B"
#: lib/noticelist.php:444
#, php-format
@@ -4494,7 +5269,7 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr ""
@@ -4648,60 +5423,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
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:1106
+#: lib/util.php:1129
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:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
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:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
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:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
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:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
@@ -4709,3 +5484,17 @@ msgstr "yaklaşık bir yıl önce"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 180a64e64..d5d0de408 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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:28+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:41+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 (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -57,7 +57,7 @@ msgstr "Приватно"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr "Зробити регістрацію лише за запрошеннями."
+msgstr "Зробити реєстрацію лише за запрошеннями."
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
@@ -67,7 +67,7 @@ msgstr "Лише за запрошеннями"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr "Скасувати подальшу регістрацію."
+msgstr "Скасувати подальшу реєстрацію."
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
@@ -85,7 +85,7 @@ msgstr "Зберегти параметри доступу"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "Зберегти"
@@ -697,7 +697,7 @@ msgstr ""
"Максимальна довжина допису становить %d знаків, включно з URL-адресою "
"вкладення."
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "Формат не підтримується."
@@ -892,9 +892,8 @@ msgid "Yes"
msgstr "Так"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "Блокувати користувача"
@@ -1030,7 +1029,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1129,56 +1128,56 @@ msgid "Design"
msgstr "Дизайн"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Налаштування дизайну для цього сайту StatusNet."
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "Помилкова URL-адреса логотипу."
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "Тема недоступна: %s."
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "Змінити логотип"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "Логотип сайту"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "Змінити тему"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "Тема сайту"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "Тема для цього сайту."
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "Своя тема"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "Ви можете завантажити свою тему для сайту StatusNet як .ZIP архів."
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "Змінити фонове зображення"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "Фон"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1188,75 +1187,76 @@ msgstr ""
"%1$s."
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "Увімк."
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "Вимк."
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "Увімкнути або вимкнути фонове зображення."
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "Замостити фон"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "Змінити кольори"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "Зміст"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "Бічна панель"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "Текст"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "Посилання"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "Додатково"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "Свій CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "За замовч."
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "Оновити налаштування за замовчуванням"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "Повернутись до початкових налаштувань"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "Зберегти"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "Зберегти дизайн"
@@ -1334,7 +1334,7 @@ msgstr "Форма зворотнього дзвінка надто довга."
msgid "Callback URL is not valid."
msgstr "URL-адреса для зворотнього дзвінка не є дійсною."
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "Не вдалося оновити додаток."
@@ -1427,7 +1427,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Скасувати"
@@ -1894,6 +1894,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "Блок"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "Надати користувачеві права адміністратора"
@@ -2343,6 +2349,110 @@ msgstr "Ви не є учасником цієї групи."
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "Тепер Ви увійшли."
@@ -2582,9 +2692,8 @@ msgid "Connected applications"
msgstr "Під’єднані додатки"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
msgstr ""
-"Ви маєте дозволити наступним додаткам доступ до Вашого облікового запису."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2607,7 +2716,7 @@ msgstr "Розробники можуть змінити налаштуванн
msgid "Notice has no profile."
msgstr "Допис не має профілю."
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s має статус на %2$s"
@@ -2773,8 +2882,8 @@ msgid "Paths"
msgstr "Шлях"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Шлях та налаштування серверу для цього сайту StatusNet."
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -3418,7 +3527,7 @@ msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"Мої тексти і файли доступні під %s, окрім цих приватних даних: пароль, "
+"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
"електронна адреса, адреса IM, телефонний номер."
#: actions/register.php:583
@@ -3487,7 +3596,7 @@ msgstr "Ім’я користувача"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr "Ім’я користувача за яким Ви бажаєте слідувати"
+msgstr "Ім’я користувача, дописи якого Ви хотіли б читати."
#: actions/remotesubscribe.php:133
msgid "Profile URL"
@@ -3628,8 +3737,8 @@ msgid "Sessions"
msgstr "Сесії"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Налаштування сесії для цього сайту StatusNet."
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3648,7 +3757,6 @@ msgid "Turn on debugging output for sessions."
msgstr "Виводити дані сесії наладки."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "Зберегти налаштування сайту"
@@ -4567,75 +4675,79 @@ msgid ""
msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "Користувач"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Власні налаштування користувача для цього сайту StatusNet."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "Помилкове обмеження біо. Це мають бути цифри."
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr "Помилковий текст привітання. Максимальна довжина 255 знаків."
+msgstr "Помилковий текст привітання. Максимальна довжина — 255 символів."
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "Профіль"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "Обмеження біо"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "Максимальна довжина біо користувача в знаках."
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "Нові користувачі"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "Привітання нового користувача"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "Текст привітання нових користувачів (255 знаків)."
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "Підписка за замовчуванням"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "Автоматично підписувати нових користувачів до цього користувача."
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "Запрошення"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "Запрошення скасовано"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr ""
"В той чи інший спосіб дозволити користувачам вітати нових користувачів."
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "Авторизувати підписку"
@@ -4650,7 +4762,9 @@ msgstr ""
"підписатись на дописи цього користувача. Якщо Ви не збирались підписуватись "
"ні на чиї дописи, просто натисніть «Відмінити»."
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "Ліцензія"
@@ -4850,6 +4964,15 @@ msgstr "Версія"
msgid "Author(s)"
msgstr "Автор(и)"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "Обрати"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4906,6 +5029,17 @@ msgstr "Не є частиною групи."
msgid "Group leave failed."
msgstr "Не вдалося залишити групу."
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "Приєднатись"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4990,18 +5124,18 @@ msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "Задається невірний тип для saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "Проблема при збереженні вхідних дописів для групи."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5027,7 +5161,7 @@ msgid "Missing profile."
msgstr "Загублений профіль."
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "Не вдається зберегти теґ."
@@ -5066,9 +5200,18 @@ msgstr "Не вдається видалити токен підписки OMB."
msgid "Could not delete subscription."
msgstr "Не вдалося видалити підписку."
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
@@ -5388,19 +5531,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "Назад"
@@ -5509,6 +5652,11 @@ msgstr "Редагувати повідомлення сайту"
msgid "Snapshots configuration"
msgstr "Конфігурація знімків"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5594,38 +5742,38 @@ msgid "URL to redirect to after authentication"
msgstr "URL-адреса, на яку перенаправляти після автентифікації"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "Браузер"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "Десктоп"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "Тип додатку, браузер або десктоп"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "Лише читання"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "Читати-писати"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Дозвіл за замовчуванням для цього додатку: лише читання або читати-писати"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "Скасувати"
@@ -6121,10 +6269,6 @@ msgstr "Видалити з обраних"
msgid "Favor this notice"
msgstr "Позначити як обране"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Обрати"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -6142,8 +6286,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Експорт даних"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6336,10 +6480,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "Невідоме джерело вхідного повідомлення %d."
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Приєднатись"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "Залишити"
@@ -6683,7 +6823,7 @@ msgstr ""
#: lib/mailbox.php:228 lib/noticelist.php:506
msgid "from"
-msgstr "через"
+msgstr "з"
#: lib/mailhandler.php:37
msgid "Could not parse message."
@@ -6863,7 +7003,7 @@ msgstr "в"
#: lib/noticelist.php:502
msgid "web"
-msgstr "веб"
+msgstr "веб-сторінки"
#: lib/noticelist.php:568
msgid "in context"
@@ -7034,7 +7174,7 @@ msgstr "Повторити цей допис"
msgid "Revoke the \"%s\" role from this user"
msgstr "Відкликати роль «%s» для цього користувача"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "Користувача для однокористувацького режиму не визначено."
@@ -7264,70 +7404,70 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
-msgstr "хвилину тому"
+msgstr "близько хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] "хвилину тому"
-msgstr[1] "%d хвилин тому"
+msgstr[0] "близько хвилини тому"
+msgstr[1] "близько %d хвилин тому"
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: lib/util.php:1136
msgid "about an hour ago"
-msgstr "годину тому"
+msgstr "близько години тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] "годину тому"
-msgstr[1] "%d годин тому"
+msgstr[0] "близько години тому"
+msgstr[1] "близько %d годин тому"
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
-msgstr "день тому"
+msgstr "близько доби тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "день тому"
-msgstr[1] "%d днів тому"
+msgstr[0] "близько доби тому"
+msgstr[1] "близько %d днів тому"
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: lib/util.php:1150
msgid "about a month ago"
-msgstr "місяць тому"
+msgstr "близько місяця тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "місяць тому"
-msgstr[1] "%d місяців тому"
+msgstr[0] "близько місяця тому"
+msgstr[1] "близько %d місяців тому"
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1157
msgid "about a year ago"
-msgstr "рік тому"
+msgstr "близько року тому"
#: lib/webcolor.php:82
#, php-format
@@ -7338,3 +7478,17 @@ msgstr "%s є неприпустимим кольором!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index e2257f331..e843713e8 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -13,18 +13,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:31+0000\n"
+"POT-Creation-Date: 2010-09-27 22:19+0000\n"
+"PO-Revision-Date: 2010-09-27 22:41:41+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r73828); 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: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 1284-84-94 56::+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ msgstr "保存访问设置"
#. TRANS: Button label in the "Edit application" form.
#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:354
msgctxt "BUTTON"
msgid "Save"
msgstr "保存"
@@ -682,7 +682,7 @@ msgstr "未找到。"
msgid "Max notice size is %d chars, including attachment URL."
msgstr "每条消息最长%d字符,包括附件的链接 URL。"
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "不支持的格式。"
@@ -876,9 +876,8 @@ msgid "Yes"
msgstr "是"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
#. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:82
msgid "Block this user"
msgstr "屏蔽这个用户"
@@ -1014,7 +1013,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:1315
+#: lib/action.php:1320
msgid "There was a problem with your session token."
msgstr "你的 session token 出现了问题。"
@@ -1111,56 +1110,56 @@ msgid "Design"
msgstr "外观"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的外观设置"
+msgid "Design settings for this StatusNet site"
+msgstr ""
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "无效的 logo URL。"
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "主题不可用:%s。"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "更换 logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "网站 logo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "更换主题"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "网站主题"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "这个网站的主题。"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "自定义主题"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "更换背景图像"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "背景"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1168,75 +1167,76 @@ msgid ""
msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "打开"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "关闭"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "打开或关闭背景图片"
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "平铺背景图片"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "改变颜色"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "边栏"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "文字"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "链接"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "高级"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "自定义CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "使用默认值"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "恢复默认外观"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "重置到默认"
#. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:356 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "保存外观"
@@ -1314,7 +1314,7 @@ msgstr "调回地址(callback)过长。"
msgid "Callback URL is not valid."
msgstr "调回地址(Callback URL)无效。"
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "无法更新应用。"
@@ -1407,7 +1407,7 @@ msgstr ""
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:350
msgctxt "BUTTON"
msgid "Cancel"
msgstr "取消"
@@ -1641,7 +1641,7 @@ msgstr "%s收藏的消息"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s 上被 %1$s 收藏的消息!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1864,6 +1864,12 @@ msgctxt "BUTTON"
msgid "Block"
msgstr "屏蔽"
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "使用户成为小组的管理员"
@@ -2292,6 +2298,110 @@ msgstr "你不是该群小组成员。"
msgid "%1$s left group %2$s"
msgstr "%1$s离开了%2$s小组。"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登录。"
@@ -2521,8 +2631,8 @@ msgid "Connected applications"
msgstr "关联的应用"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "你已允许以下程序访问你的账户。"
+msgid "You have allowed the following applications to access your account."
+msgstr ""
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2545,7 +2655,7 @@ msgstr "开发者可以修改他们程序的登记设置 "
msgid "Notice has no profile."
msgstr "消息没有对应用户。"
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s在%2$s时发的消息"
@@ -2709,8 +2819,8 @@ msgid "Paths"
msgstr "路径"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的路径和服务器设置"
+msgid "Path and server settings for this StatusNet site"
+msgstr ""
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2903,7 +3013,7 @@ msgstr "个人信息"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
+msgstr "1 到 64 个小写字母或数字,不包含标点或空格"
#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
@@ -3333,8 +3443,8 @@ msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"我的文字和文件在%s下提供,除了隐私内容:密码、电子邮件地址、IM 地址和电话号"
-"码。"
+"我的文字和文件在%s下提供,除了如下隐私内容:密码、电子邮件地址、IM 地址和电话"
+"号码。"
#: actions/register.php:583
#, php-format
@@ -3534,8 +3644,8 @@ msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的外观设置"
+msgid "Session settings for this StatusNet site"
+msgstr ""
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3554,7 +3664,6 @@ msgid "Turn on debugging output for sessions."
msgstr "打开 sessions 的调试输出。"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "保存访问设置"
@@ -4445,74 +4554,78 @@ msgid ""
msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "用户"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的用户设置"
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr ""
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "无效的自述限制,必须为数字。"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "无效的欢迎文字。最大长度255个字符。"
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "无效的默认关注:“%1$s”不是一个用户。"
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信息"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "自述限制"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "个人资料自述最长的字符数。"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "新用户"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "新用户欢迎"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "给新用户的欢迎文字(不能超过255个字符)。"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "默认关注"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "邀请"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "邀请已启用"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "是否允许用户发送注册邀请。"
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr ""
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "授权关注"
@@ -4526,7 +4639,9 @@ msgstr ""
"请检查这些详细信息,确认希望关注此用户的消息。如果你不想关注,请点击\\\"拒绝"
"\\\"。"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "许可协议"
@@ -4712,6 +4827,15 @@ msgstr "版本"
msgid "Author(s)"
msgstr "作者"
+#: classes/Fave.php:147 lib/favorform.php:140
+msgid "Favor"
+msgstr "收藏"
+
+#: classes/Fave.php:148
+#, php-format
+msgid "%s marked notice %s as a favorite."
+msgstr ""
+
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:143
#, php-format
@@ -4767,6 +4891,17 @@ msgstr "不是小组成员。"
msgid "Group leave failed."
msgstr "离开小组失败。"
+#: classes/Group_member.php:108 lib/joinform.php:114
+msgid "Join"
+msgstr "加入"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:112
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr ""
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4847,18 +4982,18 @@ msgid "Problem saving notice."
msgstr "保存消息时出错。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:906
msgid "Bad type provided to saveKnownGroups"
msgstr "对 saveKnownGroups 提供的类型无效"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1005
msgid "Problem saving group inbox."
msgstr "保存小组收件箱时出错。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1824
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4883,7 +5018,7 @@ msgid "Missing profile."
msgstr "丢失的个人信息。"
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "无法保存标签。"
@@ -4922,9 +5057,18 @@ msgstr "无法删除关注 OMB token。"
msgid "Could not delete subscription."
msgstr "无法取消关注。"
+#: classes/Subscription.php:254
+msgid "Follow"
+msgstr ""
+
+#: classes/Subscription.php:255
+#, php-format
+msgid "%s is now following %s."
+msgstr ""
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "欢迎来到 %1$s,@%2$s!"
@@ -5242,19 +5386,19 @@ 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:1243
+#: lib/action.php:1248
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:1254
+#: lib/action.php:1259
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:1264
+#: lib/action.php:1269
msgid "Before"
msgstr "之前"
@@ -5362,6 +5506,11 @@ msgstr "编辑网站消息"
msgid "Snapshots configuration"
msgstr "更改站点配置"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr ""
+
#. TRANS: Client error 401.
#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
@@ -5391,12 +5540,12 @@ msgstr "无法验证你。"
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
#: lib/apioauthstore.php:178
msgid "Tried to revoke unknown token."
-msgstr ""
+msgstr "尝试了取消未知的 token。"
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
#: lib/apioauthstore.php:182
msgid "Failed to delete revoked token."
-msgstr ""
+msgstr "删除取消的 token 失败。"
#. TRANS: Form legend.
#: lib/applicationeditform.php:129
@@ -5445,37 +5594,37 @@ msgid "URL to redirect to after authentication"
msgstr "通过授权后转向的 URL"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:270
msgid "Browser"
msgstr "浏览器"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:287
msgid "Desktop"
msgstr "桌面"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:289
msgid "Type of application, browser or desktop"
msgstr "应用的类型,浏览器或桌面"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:313
msgid "Read-only"
msgstr "只读"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:333
msgid "Read-write"
msgstr "读写"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:335
msgid "Default access for this application: read-only, or read-write"
msgstr "该应用默认的访问权限:只读或读写"
#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:352
msgid "Cancel"
msgstr "取消"
@@ -5962,10 +6111,6 @@ msgstr "取消收藏这个消息"
msgid "Favor this notice"
msgstr "收藏"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "收藏"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5983,8 +6128,8 @@ msgid "FOAF"
msgstr "FOAF"
#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "RSS 订阅"
+msgid "Feeds"
+msgstr ""
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6176,10 +6321,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "未知的收件箱来源%d。"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "加入"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "离开"
@@ -6631,7 +6772,7 @@ msgstr "发布"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "发送一个消息"
+msgstr "发送一个通知"
#: lib/noticeform.php:174
#, php-format
@@ -6862,7 +7003,7 @@ msgstr "转发"
msgid "Revoke the \"%s\" role from this user"
msgstr "取消这个用户的\"%s\"权限"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "没有单独的用户被定义为单用户模式。"
@@ -7087,60 +7228,60 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1133
#, 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:1113
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1140
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] "约一小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
#, 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:1127
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1154
#, 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:1134
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "约1年前"
@@ -7153,3 +7294,17 @@ msgstr "%s不是有效的颜色!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s不是有效的颜色!应使用3或6个十六进制字符。"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)\n"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user.\n"
+msgstr ""
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup.\n"
+msgstr ""